Fossil SCM

Update the SQLite to avoid the compiler warning and to show the SQLITE_ENABLE_SETLK_TIMEOUT compile-time option.

drh 2025-02-11 18:34 setlk-test
Commit 5045fc26b3f771f1d712612b2ad9e190ecd9ae2604d0f89c1388ca63765139c8
Parent dcbf6a1fbc92f58…
2 files changed +7 -4 +1 -1
~ extsrc/sqlite3.c ~ extsrc/sqlite3.h
M extsrc/sqlite3.c
+7 -4
--- 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
-** e5ec5bb9f4dc3e02db7ab0e49686f47617af with changes in files:
21
+** 303e8009ab59aad32030407baf3eff9443f7 with changes in files:
2222
 **
2323
 **
2424
 */
2525
 #ifndef SQLITE_AMALGAMATION
2626
 #define SQLITE_CORE 1
@@ -465,11 +465,11 @@
465465
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
466466
 ** [sqlite_version()] and [sqlite_source_id()].
467467
 */
468468
 #define SQLITE_VERSION "3.50.0"
469469
 #define SQLITE_VERSION_NUMBER 3050000
470
-#define SQLITE_SOURCE_ID "2025-02-11 17:10:46 e5ec5bb9f4dc3e02db7ab0e49686f47617af75d3f7d4ab23288a1aea4a693e59"
470
+#define SQLITE_SOURCE_ID "2025-02-11 18:32:22 303e8009ab59aad32030407baf3eff9443f7f9bed7947218b78293b06bba1737"
471471
472472
 /*
473473
 ** CAPI3REF: Run-Time Library Version Numbers
474474
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
475475
 **
@@ -22588,10 +22588,13 @@
2258822588
 #ifdef SQLITE_ENABLE_RTREE
2258922589
 "ENABLE_RTREE",
2259022590
 #endif
2259122591
 #ifdef SQLITE_ENABLE_SESSION
2259222592
 "ENABLE_SESSION",
22593
+#endif
22594
+#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
22595
+ "ENABLE_SETLK_TIMEOUT",
2259322596
 #endif
2259422597
 #ifdef SQLITE_ENABLE_SNAPSHOT
2259522598
 "ENABLE_SNAPSHOT",
2259622599
 #endif
2259722600
 #ifdef SQLITE_ENABLE_SORTER_REFERENCES
@@ -43703,11 +43706,11 @@
4370343706
 ** occur later in the above list than the lock being obtained may be
4370443707
 ** held.
4370543708
 **
4370643709
 ** It is not permitted to block on the RECOVER lock.
4370743710
 */
43708
-#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
43711
+#if defined(SQLITE_ENABLE_SETLK_TIMEOUT) && defined(SQLITE_DEBUG)
4370943712
 {
4371043713
 u16 lockMask = (p->exclMask|p->sharedMask);
4371143714
 assert( (flags & SQLITE_SHM_UNLOCK) || pDbFd->iBusyTimeout==0 || (
4371243715
 (ofst!=2) /* not RECOVER */
4371343716
 && (ofst!=1 || lockMask==0 || lockMask==2)
@@ -51325,11 +51328,11 @@
5132551328
 ** occur later in the above list than the lock being obtained may be
5132651329
 ** held.
5132751330
 **
5132851331
 ** It is not permitted to block on the RECOVER lock.
5132951332
 */
51330
-#ifdef SQLITE_ENABLE_SETLK_TIMEOUT
51333
+#if defined(SQLITE_ENABLE_SETLK_TIMEOUT) && defined(SQLITE_DEBUG)
5133151334
 {
5133251335
 u16 lockMask = (p->exclMask|p->sharedMask);
5133351336
 assert( (flags & SQLITE_SHM_UNLOCK) || pDbFd->iBusyTimeout==0 || (
5133451337
 (ofst!=2) /* not RECOVER */
5133551338
 && (ofst!=1 || lockMask==0 || lockMask==2)
5133651339
--- 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 ** e5ec5bb9f4dc3e02db7ab0e49686f47617af with changes in files:
22 **
23 **
24 */
25 #ifndef SQLITE_AMALGAMATION
26 #define SQLITE_CORE 1
@@ -465,11 +465,11 @@
465 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
466 ** [sqlite_version()] and [sqlite_source_id()].
467 */
468 #define SQLITE_VERSION "3.50.0"
469 #define SQLITE_VERSION_NUMBER 3050000
470 #define SQLITE_SOURCE_ID "2025-02-11 17:10:46 e5ec5bb9f4dc3e02db7ab0e49686f47617af75d3f7d4ab23288a1aea4a693e59"
471
472 /*
473 ** CAPI3REF: Run-Time Library Version Numbers
474 ** KEYWORDS: sqlite3_version sqlite3_sourceid
475 **
@@ -22588,10 +22588,13 @@
22588 #ifdef SQLITE_ENABLE_RTREE
22589 "ENABLE_RTREE",
22590 #endif
22591 #ifdef SQLITE_ENABLE_SESSION
22592 "ENABLE_SESSION",
 
 
 
22593 #endif
22594 #ifdef SQLITE_ENABLE_SNAPSHOT
22595 "ENABLE_SNAPSHOT",
22596 #endif
22597 #ifdef SQLITE_ENABLE_SORTER_REFERENCES
@@ -43703,11 +43706,11 @@
43703 ** occur later in the above list than the lock being obtained may be
43704 ** held.
43705 **
43706 ** It is not permitted to block on the RECOVER lock.
43707 */
43708 #ifdef SQLITE_ENABLE_SETLK_TIMEOUT
43709 {
43710 u16 lockMask = (p->exclMask|p->sharedMask);
43711 assert( (flags & SQLITE_SHM_UNLOCK) || pDbFd->iBusyTimeout==0 || (
43712 (ofst!=2) /* not RECOVER */
43713 && (ofst!=1 || lockMask==0 || lockMask==2)
@@ -51325,11 +51328,11 @@
51325 ** occur later in the above list than the lock being obtained may be
51326 ** held.
51327 **
51328 ** It is not permitted to block on the RECOVER lock.
51329 */
51330 #ifdef SQLITE_ENABLE_SETLK_TIMEOUT
51331 {
51332 u16 lockMask = (p->exclMask|p->sharedMask);
51333 assert( (flags & SQLITE_SHM_UNLOCK) || pDbFd->iBusyTimeout==0 || (
51334 (ofst!=2) /* not RECOVER */
51335 && (ofst!=1 || lockMask==0 || lockMask==2)
51336
--- 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 ** 303e8009ab59aad32030407baf3eff9443f7 with changes in files:
22 **
23 **
24 */
25 #ifndef SQLITE_AMALGAMATION
26 #define SQLITE_CORE 1
@@ -465,11 +465,11 @@
465 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
466 ** [sqlite_version()] and [sqlite_source_id()].
467 */
468 #define SQLITE_VERSION "3.50.0"
469 #define SQLITE_VERSION_NUMBER 3050000
470 #define SQLITE_SOURCE_ID "2025-02-11 18:32:22 303e8009ab59aad32030407baf3eff9443f7f9bed7947218b78293b06bba1737"
471
472 /*
473 ** CAPI3REF: Run-Time Library Version Numbers
474 ** KEYWORDS: sqlite3_version sqlite3_sourceid
475 **
@@ -22588,10 +22588,13 @@
22588 #ifdef SQLITE_ENABLE_RTREE
22589 "ENABLE_RTREE",
22590 #endif
22591 #ifdef SQLITE_ENABLE_SESSION
22592 "ENABLE_SESSION",
22593 #endif
22594 #ifdef SQLITE_ENABLE_SETLK_TIMEOUT
22595 "ENABLE_SETLK_TIMEOUT",
22596 #endif
22597 #ifdef SQLITE_ENABLE_SNAPSHOT
22598 "ENABLE_SNAPSHOT",
22599 #endif
22600 #ifdef SQLITE_ENABLE_SORTER_REFERENCES
@@ -43703,11 +43706,11 @@
43706 ** occur later in the above list than the lock being obtained may be
43707 ** held.
43708 **
43709 ** It is not permitted to block on the RECOVER lock.
43710 */
43711 #if defined(SQLITE_ENABLE_SETLK_TIMEOUT) && defined(SQLITE_DEBUG)
43712 {
43713 u16 lockMask = (p->exclMask|p->sharedMask);
43714 assert( (flags & SQLITE_SHM_UNLOCK) || pDbFd->iBusyTimeout==0 || (
43715 (ofst!=2) /* not RECOVER */
43716 && (ofst!=1 || lockMask==0 || lockMask==2)
@@ -51325,11 +51328,11 @@
51328 ** occur later in the above list than the lock being obtained may be
51329 ** held.
51330 **
51331 ** It is not permitted to block on the RECOVER lock.
51332 */
51333 #if defined(SQLITE_ENABLE_SETLK_TIMEOUT) && defined(SQLITE_DEBUG)
51334 {
51335 u16 lockMask = (p->exclMask|p->sharedMask);
51336 assert( (flags & SQLITE_SHM_UNLOCK) || pDbFd->iBusyTimeout==0 || (
51337 (ofst!=2) /* not RECOVER */
51338 && (ofst!=1 || lockMask==0 || lockMask==2)
51339
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.50.0"
150150
 #define SQLITE_VERSION_NUMBER 3050000
151
-#define SQLITE_SOURCE_ID "2025-02-11 17:10:46 e5ec5bb9f4dc3e02db7ab0e49686f47617af75d3f7d4ab23288a1aea4a693e59"
151
+#define SQLITE_SOURCE_ID "2025-02-11 18:32:22 303e8009ab59aad32030407baf3eff9443f7f9bed7947218b78293b06bba1737"
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.50.0"
150 #define SQLITE_VERSION_NUMBER 3050000
151 #define SQLITE_SOURCE_ID "2025-02-11 17:10:46 e5ec5bb9f4dc3e02db7ab0e49686f47617af75d3f7d4ab23288a1aea4a693e59"
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.50.0"
150 #define SQLITE_VERSION_NUMBER 3050000
151 #define SQLITE_SOURCE_ID "2025-02-11 18:32:22 303e8009ab59aad32030407baf3eff9443f7f9bed7947218b78293b06bba1737"
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