Fossil SCM

Update the built-in SQLite to a newer version that does not give warnings on Windows.

drh 2024-02-22 00:51 trunk
Commit 35f4dae3d6ccc233f3784cfcfb31bcdf08c2a7358edda30d60056f20bfe90e1b
Parent 3e0b35edee23839…
2 files changed +7 -7 +1 -1
~ extsrc/sqlite3.c ~ extsrc/sqlite3.h
M extsrc/sqlite3.c
+7 -7
--- extsrc/sqlite3.c
+++ extsrc/sqlite3.c
@@ -16,11 +16,11 @@
1616
 ** if you want a wrapper to interface SQLite with your choice of programming
1717
 ** language. The code for the "sqlite3" command-line shell is also in a
1818
 ** separate file. This file contains only code for the core SQLite library.
1919
 **
2020
 ** The content in this amalgamation comes from Fossil check-in
21
-** 27a2113d78b35e324e9aedda7403c96c56ad.
21
+** ce5df19dc4aff3fde03ef62261a5e095a16a.
2222
 */
2323
 #define SQLITE_CORE 1
2424
 #define SQLITE_AMALGAMATION 1
2525
 #ifndef SQLITE_PRIVATE
2626
 # define SQLITE_PRIVATE static
@@ -459,11 +459,11 @@
459459
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
460460
 ** [sqlite_version()] and [sqlite_source_id()].
461461
 */
462462
 #define SQLITE_VERSION "3.46.0"
463463
 #define SQLITE_VERSION_NUMBER 3046000
464
-#define SQLITE_SOURCE_ID "2024-02-20 15:38:36 27a2113d78b35e324e9aedda7403c96c56ad0bed8c6b139fc5a179e8800b9109"
464
+#define SQLITE_SOURCE_ID "2024-02-22 00:50:54 ce5df19dc4aff3fde03ef62261a5e095a16a8f4e46e2924becea4fed56ce49e3"
465465
466466
 /*
467467
 ** CAPI3REF: Run-Time Library Version Numbers
468468
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
469469
 **
@@ -30221,13 +30221,13 @@
3022130221
 ** This routine is called whenever an out-of-memory condition is seen,
3022230222
 ** It's only purpose to to serve as a breakpoint for gdb or similar
3022330223
 ** code debuggers when working on out-of-memory conditions, for example
3022430224
 ** caused by PRAGMA hard_heap_limit=N.
3022530225
 */
30226
-static SQLITE_NOINLINE void test_oom_breakpoint(void){
30226
+static SQLITE_NOINLINE void test_oom_breakpoint(u64 n){
3022730227
 static u64 nOomFault = 0;
30228
- nOomFault++;
30228
+ nOomFault += n;
3022930229
 /* The assert() is never reached in a human lifetime. It is here mostly
3023030230
 ** to prevent code optimizers from optimizing out this function. */
3023130231
 assert( (nOomFault>>32) < 0xffffffff );
3023230232
 }
3023330233
 #else
@@ -30258,11 +30258,11 @@
3025830258
 AtomicStore(&mem0.nearlyFull, 1);
3025930259
 sqlite3MallocAlarm(nFull);
3026030260
 if( mem0.hardLimit ){
3026130261
 nUsed = sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED);
3026230262
 if( nUsed >= mem0.hardLimit - nFull ){
30263
- test_oom_breakpoint();
30263
+ test_oom_breakpoint(1);
3026430264
 *pp = 0;
3026530265
 return;
3026630266
 }
3026730267
 }
3026830268
 }else{
@@ -30547,11 +30547,11 @@
3054730547
 if( nDiff>0 && (nUsed = sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED)) >=
3054830548
 mem0.alarmThreshold-nDiff ){
3054930549
 sqlite3MallocAlarm(nDiff);
3055030550
 if( mem0.hardLimit>0 && nUsed >= mem0.hardLimit - nDiff ){
3055130551
 sqlite3_mutex_leave(mem0.mutex);
30552
- test_oom_breakpoint();
30552
+ test_oom_breakpoint(1);
3055330553
 return 0;
3055430554
 }
3055530555
 }
3055630556
 pNew = sqlite3GlobalConfig.m.xRealloc(pOld, nNew);
3055730557
 #ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
@@ -137990,11 +137990,11 @@
137990137990
 **
137991137991
 ** The value of 2000 is chosen emperically so that the worst-case run-time
137992137992
 ** for PRAGMA optimize does not exceed 100 milliseconds against a variety
137993137993
 ** of test databases on a RaspberryPI-4 compiled using -Os and without
137994137994
 ** -DSQLITE_DEBUG. Of course, your mileage may vary. For the purpose of
137995
-** his paragraph, "worst-case" means that ANALYZE ends up being
137995
+** this paragraph, "worst-case" means that ANALYZE ends up being
137996137996
 ** run on every table in the database. The worst case typically only
137997137997
 ** happens if PRAGMA optimize is run on a database file for which ANALYZE
137998137998
 ** has not been previously run and the 0x10000 flag is included so that
137999137999
 ** all tables are analyzed. The usual case for PRAGMA optimize is that
138000138000
 ** no ANALYZE commands will be run at all, or if any ANALYZE happens it
138001138001
--- extsrc/sqlite3.c
+++ extsrc/sqlite3.c
@@ -16,11 +16,11 @@
16 ** if you want a wrapper to interface SQLite with your choice of programming
17 ** language. The code for the "sqlite3" command-line shell is also in a
18 ** separate file. This file contains only code for the core SQLite library.
19 **
20 ** The content in this amalgamation comes from Fossil check-in
21 ** 27a2113d78b35e324e9aedda7403c96c56ad.
22 */
23 #define SQLITE_CORE 1
24 #define SQLITE_AMALGAMATION 1
25 #ifndef SQLITE_PRIVATE
26 # define SQLITE_PRIVATE static
@@ -459,11 +459,11 @@
459 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
460 ** [sqlite_version()] and [sqlite_source_id()].
461 */
462 #define SQLITE_VERSION "3.46.0"
463 #define SQLITE_VERSION_NUMBER 3046000
464 #define SQLITE_SOURCE_ID "2024-02-20 15:38:36 27a2113d78b35e324e9aedda7403c96c56ad0bed8c6b139fc5a179e8800b9109"
465
466 /*
467 ** CAPI3REF: Run-Time Library Version Numbers
468 ** KEYWORDS: sqlite3_version sqlite3_sourceid
469 **
@@ -30221,13 +30221,13 @@
30221 ** This routine is called whenever an out-of-memory condition is seen,
30222 ** It's only purpose to to serve as a breakpoint for gdb or similar
30223 ** code debuggers when working on out-of-memory conditions, for example
30224 ** caused by PRAGMA hard_heap_limit=N.
30225 */
30226 static SQLITE_NOINLINE void test_oom_breakpoint(void){
30227 static u64 nOomFault = 0;
30228 nOomFault++;
30229 /* The assert() is never reached in a human lifetime. It is here mostly
30230 ** to prevent code optimizers from optimizing out this function. */
30231 assert( (nOomFault>>32) < 0xffffffff );
30232 }
30233 #else
@@ -30258,11 +30258,11 @@
30258 AtomicStore(&mem0.nearlyFull, 1);
30259 sqlite3MallocAlarm(nFull);
30260 if( mem0.hardLimit ){
30261 nUsed = sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED);
30262 if( nUsed >= mem0.hardLimit - nFull ){
30263 test_oom_breakpoint();
30264 *pp = 0;
30265 return;
30266 }
30267 }
30268 }else{
@@ -30547,11 +30547,11 @@
30547 if( nDiff>0 && (nUsed = sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED)) >=
30548 mem0.alarmThreshold-nDiff ){
30549 sqlite3MallocAlarm(nDiff);
30550 if( mem0.hardLimit>0 && nUsed >= mem0.hardLimit - nDiff ){
30551 sqlite3_mutex_leave(mem0.mutex);
30552 test_oom_breakpoint();
30553 return 0;
30554 }
30555 }
30556 pNew = sqlite3GlobalConfig.m.xRealloc(pOld, nNew);
30557 #ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
@@ -137990,11 +137990,11 @@
137990 **
137991 ** The value of 2000 is chosen emperically so that the worst-case run-time
137992 ** for PRAGMA optimize does not exceed 100 milliseconds against a variety
137993 ** of test databases on a RaspberryPI-4 compiled using -Os and without
137994 ** -DSQLITE_DEBUG. Of course, your mileage may vary. For the purpose of
137995 ** his paragraph, "worst-case" means that ANALYZE ends up being
137996 ** run on every table in the database. The worst case typically only
137997 ** happens if PRAGMA optimize is run on a database file for which ANALYZE
137998 ** has not been previously run and the 0x10000 flag is included so that
137999 ** all tables are analyzed. The usual case for PRAGMA optimize is that
138000 ** no ANALYZE commands will be run at all, or if any ANALYZE happens it
138001
--- extsrc/sqlite3.c
+++ extsrc/sqlite3.c
@@ -16,11 +16,11 @@
16 ** if you want a wrapper to interface SQLite with your choice of programming
17 ** language. The code for the "sqlite3" command-line shell is also in a
18 ** separate file. This file contains only code for the core SQLite library.
19 **
20 ** The content in this amalgamation comes from Fossil check-in
21 ** ce5df19dc4aff3fde03ef62261a5e095a16a.
22 */
23 #define SQLITE_CORE 1
24 #define SQLITE_AMALGAMATION 1
25 #ifndef SQLITE_PRIVATE
26 # define SQLITE_PRIVATE static
@@ -459,11 +459,11 @@
459 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
460 ** [sqlite_version()] and [sqlite_source_id()].
461 */
462 #define SQLITE_VERSION "3.46.0"
463 #define SQLITE_VERSION_NUMBER 3046000
464 #define SQLITE_SOURCE_ID "2024-02-22 00:50:54 ce5df19dc4aff3fde03ef62261a5e095a16a8f4e46e2924becea4fed56ce49e3"
465
466 /*
467 ** CAPI3REF: Run-Time Library Version Numbers
468 ** KEYWORDS: sqlite3_version sqlite3_sourceid
469 **
@@ -30221,13 +30221,13 @@
30221 ** This routine is called whenever an out-of-memory condition is seen,
30222 ** It's only purpose to to serve as a breakpoint for gdb or similar
30223 ** code debuggers when working on out-of-memory conditions, for example
30224 ** caused by PRAGMA hard_heap_limit=N.
30225 */
30226 static SQLITE_NOINLINE void test_oom_breakpoint(u64 n){
30227 static u64 nOomFault = 0;
30228 nOomFault += n;
30229 /* The assert() is never reached in a human lifetime. It is here mostly
30230 ** to prevent code optimizers from optimizing out this function. */
30231 assert( (nOomFault>>32) < 0xffffffff );
30232 }
30233 #else
@@ -30258,11 +30258,11 @@
30258 AtomicStore(&mem0.nearlyFull, 1);
30259 sqlite3MallocAlarm(nFull);
30260 if( mem0.hardLimit ){
30261 nUsed = sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED);
30262 if( nUsed >= mem0.hardLimit - nFull ){
30263 test_oom_breakpoint(1);
30264 *pp = 0;
30265 return;
30266 }
30267 }
30268 }else{
@@ -30547,11 +30547,11 @@
30547 if( nDiff>0 && (nUsed = sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED)) >=
30548 mem0.alarmThreshold-nDiff ){
30549 sqlite3MallocAlarm(nDiff);
30550 if( mem0.hardLimit>0 && nUsed >= mem0.hardLimit - nDiff ){
30551 sqlite3_mutex_leave(mem0.mutex);
30552 test_oom_breakpoint(1);
30553 return 0;
30554 }
30555 }
30556 pNew = sqlite3GlobalConfig.m.xRealloc(pOld, nNew);
30557 #ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
@@ -137990,11 +137990,11 @@
137990 **
137991 ** The value of 2000 is chosen emperically so that the worst-case run-time
137992 ** for PRAGMA optimize does not exceed 100 milliseconds against a variety
137993 ** of test databases on a RaspberryPI-4 compiled using -Os and without
137994 ** -DSQLITE_DEBUG. Of course, your mileage may vary. For the purpose of
137995 ** this paragraph, "worst-case" means that ANALYZE ends up being
137996 ** run on every table in the database. The worst case typically only
137997 ** happens if PRAGMA optimize is run on a database file for which ANALYZE
137998 ** has not been previously run and the 0x10000 flag is included so that
137999 ** all tables are analyzed. The usual case for PRAGMA optimize is that
138000 ** no ANALYZE commands will be run at all, or if any ANALYZE happens it
138001
M extsrc/sqlite3.h
+1 -1
--- extsrc/sqlite3.h
+++ extsrc/sqlite3.h
@@ -146,11 +146,11 @@
146146
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
147147
 ** [sqlite_version()] and [sqlite_source_id()].
148148
 */
149149
 #define SQLITE_VERSION "3.46.0"
150150
 #define SQLITE_VERSION_NUMBER 3046000
151
-#define SQLITE_SOURCE_ID "2024-02-20 15:38:36 27a2113d78b35e324e9aedda7403c96c56ad0bed8c6b139fc5a179e8800b9109"
151
+#define SQLITE_SOURCE_ID "2024-02-22 00:50:54 ce5df19dc4aff3fde03ef62261a5e095a16a8f4e46e2924becea4fed56ce49e3"
152152
153153
 /*
154154
 ** CAPI3REF: Run-Time Library Version Numbers
155155
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
156156
 **
157157
--- extsrc/sqlite3.h
+++ extsrc/sqlite3.h
@@ -146,11 +146,11 @@
146 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
147 ** [sqlite_version()] and [sqlite_source_id()].
148 */
149 #define SQLITE_VERSION "3.46.0"
150 #define SQLITE_VERSION_NUMBER 3046000
151 #define SQLITE_SOURCE_ID "2024-02-20 15:38:36 27a2113d78b35e324e9aedda7403c96c56ad0bed8c6b139fc5a179e8800b9109"
152
153 /*
154 ** CAPI3REF: Run-Time Library Version Numbers
155 ** KEYWORDS: sqlite3_version sqlite3_sourceid
156 **
157
--- extsrc/sqlite3.h
+++ extsrc/sqlite3.h
@@ -146,11 +146,11 @@
146 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
147 ** [sqlite_version()] and [sqlite_source_id()].
148 */
149 #define SQLITE_VERSION "3.46.0"
150 #define SQLITE_VERSION_NUMBER 3046000
151 #define SQLITE_SOURCE_ID "2024-02-22 00:50:54 ce5df19dc4aff3fde03ef62261a5e095a16a8f4e46e2924becea4fed56ce49e3"
152
153 /*
154 ** CAPI3REF: Run-Time Library Version Numbers
155 ** KEYWORDS: sqlite3_version sqlite3_sourceid
156 **
157

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button