Fossil SCM

Update the built-in SQLite to the 3.22.0 final.

drh 2018-01-24 19:17 trunk
Commit 8007cfc0db1011dcd93e6e9537001762114e197c6c4c021fc125ef11afe1dcd8
Parent 0ac1895c7f067bb…
2 files changed +8 -5 +1 -1
~ src/sqlite3.c ~ src/sqlite3.h
M src/sqlite3.c
+8 -5
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1147,11 +1147,11 @@
11471147
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
11481148
 ** [sqlite_version()] and [sqlite_source_id()].
11491149
 */
11501150
 #define SQLITE_VERSION "3.22.0"
11511151
 #define SQLITE_VERSION_NUMBER 3022000
1152
-#define SQLITE_SOURCE_ID "2018-01-20 15:48:45 136bf323e42dc90e1780199a381bcbb084b069eca5c7343ee6fc6e2550831536"
1152
+#define SQLITE_SOURCE_ID "2018-01-22 18:45:57 0c55d179733b46d8d0ba4d88e01a25e10677046ee3da1d5b1581e86726f2171d"
11531153
11541154
 /*
11551155
 ** CAPI3REF: Run-Time Library Version Numbers
11561156
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
11571157
 **
@@ -60524,13 +60524,16 @@
6052460524
 ** normally produced as a side-effect of SQLITE_CORRUPT_BKPT is augmented
6052560525
 ** with the page number and filename associated with the (MemPage*).
6052660526
 */
6052760527
 #ifdef SQLITE_DEBUG
6052860528
 int corruptPageError(int lineno, MemPage *p){
60529
- char *zMsg = sqlite3_mprintf("database corruption page %d of %s",
60529
+ char *zMsg;
60530
+ sqlite3BeginBenignMalloc();
60531
+ zMsg = sqlite3_mprintf("database corruption page %d of %s",
6053060532
 (int)p->pgno, sqlite3PagerFilename(p->pBt->pPager, 0)
6053160533
 );
60534
+ sqlite3EndBenignMalloc();
6053260535
 if( zMsg ){
6053360536
 sqlite3ReportError(SQLITE_CORRUPT, lineno, zMsg);
6053460537
 }
6053560538
 sqlite3_free(zMsg);
6053660539
 return SQLITE_CORRUPT_BKPT;
@@ -203328,11 +203331,11 @@
203328203331
 int nArg, /* Number of args */
203329203332
 sqlite3_value **apUnused /* Function arguments */
203330203333
 ){
203331203334
 assert( nArg==0 );
203332203335
 UNUSED_PARAM2(nArg, apUnused);
203333
- sqlite3_result_text(pCtx, "fts5: 2018-01-20 15:48:45 136bf323e42dc90e1780199a381bcbb084b069eca5c7343ee6fc6e2550831536", -1, SQLITE_TRANSIENT);
203336
+ sqlite3_result_text(pCtx, "fts5: 2018-01-22 18:45:57 0c55d179733b46d8d0ba4d88e01a25e10677046ee3da1d5b1581e86726f2171d", -1, SQLITE_TRANSIENT);
203334203337
 }
203335203338
203336203339
 static int fts5Init(sqlite3 *db){
203337203340
 static const sqlite3_module fts5Mod = {
203338203341
 /* iVersion */ 2,
@@ -207596,12 +207599,12 @@
207596207599
 }
207597207600
 #endif /* SQLITE_CORE */
207598207601
 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
207599207602
207600207603
 /************** End of stmt.c ************************************************/
207601
-#if __LINE__!=207601
207604
+#if __LINE__!=207604
207602207605
 #undef SQLITE_SOURCE_ID
207603
-#define SQLITE_SOURCE_ID "2018-01-20 15:48:45 136bf323e42dc90e1780199a381bcbb084b069eca5c7343ee6fc6e255083alt2"
207606
+#define SQLITE_SOURCE_ID "2018-01-22 18:45:57 0c55d179733b46d8d0ba4d88e01a25e10677046ee3da1d5b1581e86726f2alt2"
207604207607
 #endif
207605207608
 /* Return the source-id for this library */
207606207609
 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
207607207610
 /************************** End of sqlite3.c ******************************/
207608207611
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1147,11 +1147,11 @@
1147 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
1148 ** [sqlite_version()] and [sqlite_source_id()].
1149 */
1150 #define SQLITE_VERSION "3.22.0"
1151 #define SQLITE_VERSION_NUMBER 3022000
1152 #define SQLITE_SOURCE_ID "2018-01-20 15:48:45 136bf323e42dc90e1780199a381bcbb084b069eca5c7343ee6fc6e2550831536"
1153
1154 /*
1155 ** CAPI3REF: Run-Time Library Version Numbers
1156 ** KEYWORDS: sqlite3_version sqlite3_sourceid
1157 **
@@ -60524,13 +60524,16 @@
60524 ** normally produced as a side-effect of SQLITE_CORRUPT_BKPT is augmented
60525 ** with the page number and filename associated with the (MemPage*).
60526 */
60527 #ifdef SQLITE_DEBUG
60528 int corruptPageError(int lineno, MemPage *p){
60529 char *zMsg = sqlite3_mprintf("database corruption page %d of %s",
 
 
60530 (int)p->pgno, sqlite3PagerFilename(p->pBt->pPager, 0)
60531 );
 
60532 if( zMsg ){
60533 sqlite3ReportError(SQLITE_CORRUPT, lineno, zMsg);
60534 }
60535 sqlite3_free(zMsg);
60536 return SQLITE_CORRUPT_BKPT;
@@ -203328,11 +203331,11 @@
203328 int nArg, /* Number of args */
203329 sqlite3_value **apUnused /* Function arguments */
203330 ){
203331 assert( nArg==0 );
203332 UNUSED_PARAM2(nArg, apUnused);
203333 sqlite3_result_text(pCtx, "fts5: 2018-01-20 15:48:45 136bf323e42dc90e1780199a381bcbb084b069eca5c7343ee6fc6e2550831536", -1, SQLITE_TRANSIENT);
203334 }
203335
203336 static int fts5Init(sqlite3 *db){
203337 static const sqlite3_module fts5Mod = {
203338 /* iVersion */ 2,
@@ -207596,12 +207599,12 @@
207596 }
207597 #endif /* SQLITE_CORE */
207598 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
207599
207600 /************** End of stmt.c ************************************************/
207601 #if __LINE__!=207601
207602 #undef SQLITE_SOURCE_ID
207603 #define SQLITE_SOURCE_ID "2018-01-20 15:48:45 136bf323e42dc90e1780199a381bcbb084b069eca5c7343ee6fc6e255083alt2"
207604 #endif
207605 /* Return the source-id for this library */
207606 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
207607 /************************** End of sqlite3.c ******************************/
207608
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1147,11 +1147,11 @@
1147 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
1148 ** [sqlite_version()] and [sqlite_source_id()].
1149 */
1150 #define SQLITE_VERSION "3.22.0"
1151 #define SQLITE_VERSION_NUMBER 3022000
1152 #define SQLITE_SOURCE_ID "2018-01-22 18:45:57 0c55d179733b46d8d0ba4d88e01a25e10677046ee3da1d5b1581e86726f2171d"
1153
1154 /*
1155 ** CAPI3REF: Run-Time Library Version Numbers
1156 ** KEYWORDS: sqlite3_version sqlite3_sourceid
1157 **
@@ -60524,13 +60524,16 @@
60524 ** normally produced as a side-effect of SQLITE_CORRUPT_BKPT is augmented
60525 ** with the page number and filename associated with the (MemPage*).
60526 */
60527 #ifdef SQLITE_DEBUG
60528 int corruptPageError(int lineno, MemPage *p){
60529 char *zMsg;
60530 sqlite3BeginBenignMalloc();
60531 zMsg = sqlite3_mprintf("database corruption page %d of %s",
60532 (int)p->pgno, sqlite3PagerFilename(p->pBt->pPager, 0)
60533 );
60534 sqlite3EndBenignMalloc();
60535 if( zMsg ){
60536 sqlite3ReportError(SQLITE_CORRUPT, lineno, zMsg);
60537 }
60538 sqlite3_free(zMsg);
60539 return SQLITE_CORRUPT_BKPT;
@@ -203328,11 +203331,11 @@
203331 int nArg, /* Number of args */
203332 sqlite3_value **apUnused /* Function arguments */
203333 ){
203334 assert( nArg==0 );
203335 UNUSED_PARAM2(nArg, apUnused);
203336 sqlite3_result_text(pCtx, "fts5: 2018-01-22 18:45:57 0c55d179733b46d8d0ba4d88e01a25e10677046ee3da1d5b1581e86726f2171d", -1, SQLITE_TRANSIENT);
203337 }
203338
203339 static int fts5Init(sqlite3 *db){
203340 static const sqlite3_module fts5Mod = {
203341 /* iVersion */ 2,
@@ -207596,12 +207599,12 @@
207599 }
207600 #endif /* SQLITE_CORE */
207601 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
207602
207603 /************** End of stmt.c ************************************************/
207604 #if __LINE__!=207604
207605 #undef SQLITE_SOURCE_ID
207606 #define SQLITE_SOURCE_ID "2018-01-22 18:45:57 0c55d179733b46d8d0ba4d88e01a25e10677046ee3da1d5b1581e86726f2alt2"
207607 #endif
207608 /* Return the source-id for this library */
207609 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
207610 /************************** End of sqlite3.c ******************************/
207611
M src/sqlite3.h
+1 -1
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -123,11 +123,11 @@
123123
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124124
 ** [sqlite_version()] and [sqlite_source_id()].
125125
 */
126126
 #define SQLITE_VERSION "3.22.0"
127127
 #define SQLITE_VERSION_NUMBER 3022000
128
-#define SQLITE_SOURCE_ID "2018-01-20 15:48:45 136bf323e42dc90e1780199a381bcbb084b069eca5c7343ee6fc6e2550831536"
128
+#define SQLITE_SOURCE_ID "2018-01-22 18:45:57 0c55d179733b46d8d0ba4d88e01a25e10677046ee3da1d5b1581e86726f2171d"
129129
130130
 /*
131131
 ** CAPI3REF: Run-Time Library Version Numbers
132132
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133133
 **
134134
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -123,11 +123,11 @@
123 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124 ** [sqlite_version()] and [sqlite_source_id()].
125 */
126 #define SQLITE_VERSION "3.22.0"
127 #define SQLITE_VERSION_NUMBER 3022000
128 #define SQLITE_SOURCE_ID "2018-01-20 15:48:45 136bf323e42dc90e1780199a381bcbb084b069eca5c7343ee6fc6e2550831536"
129
130 /*
131 ** CAPI3REF: Run-Time Library Version Numbers
132 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133 **
134
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -123,11 +123,11 @@
123 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124 ** [sqlite_version()] and [sqlite_source_id()].
125 */
126 #define SQLITE_VERSION "3.22.0"
127 #define SQLITE_VERSION_NUMBER 3022000
128 #define SQLITE_SOURCE_ID "2018-01-22 18:45:57 0c55d179733b46d8d0ba4d88e01a25e10677046ee3da1d5b1581e86726f2171d"
129
130 /*
131 ** CAPI3REF: Run-Time Library Version Numbers
132 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133 **
134

Keyboard Shortcuts

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