/ Check-in [8baa4022]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Merge the 3.29.0 release into the wal2 branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | wal2
Files: files | file ages | folders
SHA3-256: 8baa402282a231d42f419ac220a32b532766e52180e4a70da874d383d8703121
User & Date: drh 2019-07-10 18:30:00
Wiki:wal2
Context
2019-09-16
12:23
Merge recent trunk enhancements into the wal2 branch. Leaf check-in: da8bc974 user: drh tags: wal2
2019-07-10
18:40
Merge the 3.29.0 updates into the begin-concurrent-pnu-wal2 branch. check-in: 627b428f user: drh tags: begin-concurrent-pnu-wal2
18:30
Merge the 3.29.0 release into the wal2 branch. check-in: 8baa4022 user: drh tags: wal2
17:32
Version 3.29.0 check-in: fc82b73e user: drh tags: trunk, release, version-3.29.0
2019-07-08
21:19
Merge all enhancements from trunk into the wal2 branch. check-in: dcbcbc2a user: drh tags: wal2
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/rtree/rtree.c.

    59     59   #ifndef SQLITE_CORE
    60     60     #include "sqlite3ext.h"
    61     61     SQLITE_EXTENSION_INIT1
    62     62   #else
    63     63     #include "sqlite3.h"
    64     64   #endif
    65     65   
    66         -#include <string.h>
    67         -#include <assert.h>
    68         -#include <stdio.h>
    69         -
    70     66   #ifndef SQLITE_AMALGAMATION
    71     67   #include "sqlite3rtree.h"
    72     68   typedef sqlite3_int64 i64;
    73     69   typedef sqlite3_uint64 u64;
    74     70   typedef unsigned char u8;
    75     71   typedef unsigned short u16;
    76     72   typedef unsigned int u32;
           73  +#if !defined(NDEBUG) && !defined(SQLITE_DEBUG)
           74  +# define NDEBUG 1
    77     75   #endif
           76  +#if defined(NDEBUG) && defined(SQLITE_DEBUG)
           77  +# undef NDEBUG
           78  +#endif
           79  +#endif
           80  +
           81  +#include <string.h>
           82  +#include <stdio.h>
           83  +#include <assert.h>
    78     84   
    79     85   /*  The following macro is used to suppress compiler warnings.
    80     86   */
    81     87   #ifndef UNUSED_PARAMETER
    82     88   # define UNUSED_PARAMETER(x) (void)(x)
    83     89   #endif
    84     90   

Changes to src/vdbemem.c.

   699    699   ** comparison of "r1==(double)i" you sometimes get an answer of false even
   700    700   ** though the r1 and (double)i values are bit-for-bit the same.
   701    701   */
   702    702   int sqlite3RealSameAsInt(double r1, sqlite3_int64 i){
   703    703     double r2 = (double)i;
   704    704     return r1==0.0
   705    705         || (memcmp(&r1, &r2, sizeof(r1))==0
   706         -          && i >= -2251799813685248 && i < 2251799813685248);
          706  +          && i >= -2251799813685248LL && i < 2251799813685248LL);
   707    707   }
   708    708   
   709    709   /*
   710    710   ** Convert pMem so that it has type MEM_Real or MEM_Int.
   711    711   ** Invalidate any prior representations.
   712    712   **
   713    713   ** Every effort is made to force the conversion, even if the input

Changes to test/windowfault.test.

   205    205   }
   206    206   proc tmpread_injectstop {} {
   207    207     set ret [expr $::tmp_read_fail<=0]
   208    208     unset -nocomplain ::tmp_read_fail 
   209    209     return $ret
   210    210   }
   211    211   
          212  +set L [db eval {SELECT 0.0 FROM t}]
   212    213   do_faultsim_test 9 -end 25 -faults tmpread -body {
   213    214     execsql {
   214    215       SELECT sum(y) OVER win FROM t
   215    216       WINDOW win AS (
   216    217         ORDER BY x ROWS BETWEEN UNBOUNDED PRECEDING AND 1800 FOLLOWING
   217    218       )
   218    219     }
   219    220   } -test {
   220         -  faultsim_test_result {0 {}}
          221  +  faultsim_test_result [list 0 $::L]
   221    222   }
   222    223   
   223    224   catch {db close}
   224    225   tvfs delete
   225    226   
   226    227   finish_test