Fossil SCM

Change the built-in SQLite to version 3.8.10.

drh 2015-05-07 12:31 trunk
Commit abc38398eb953144eb6c05088eab9cdb88c86705
Parent 8e44cf6f4df4f9f…
3 files changed -6 +1 -2 +1 -1
~ src/shell.c ~ src/sqlite3.c ~ src/sqlite3.h
M src/shell.c
-6
--- src/shell.c
+++ src/shell.c
@@ -1918,16 +1918,10 @@
19181918
 */
19191919
 static void open_db(ShellState *p, int keepAlive){
19201920
 if( p->db==0 ){
19211921
 sqlite3_initialize();
19221922
 sqlite3_open(p->zDbFilename, &p->db);
1923
-#ifdef SQLITE_ENABLE_DBSTAT_VTAB
1924
- if( p->db ){
1925
- int sqlite3_dbstat_register(sqlite3*);
1926
- sqlite3_dbstat_register(p->db);
1927
- }
1928
-#endif
19291923
 globalDb = p->db;
19301924
 if( p->db && sqlite3_errcode(p->db)==SQLITE_OK ){
19311925
 sqlite3_create_function(p->db, "shellstatic", 0, SQLITE_UTF8, 0,
19321926
 shellstaticFunc, 0, 0);
19331927
 }
19341928
--- src/shell.c
+++ src/shell.c
@@ -1918,16 +1918,10 @@
1918 */
1919 static void open_db(ShellState *p, int keepAlive){
1920 if( p->db==0 ){
1921 sqlite3_initialize();
1922 sqlite3_open(p->zDbFilename, &p->db);
1923 #ifdef SQLITE_ENABLE_DBSTAT_VTAB
1924 if( p->db ){
1925 int sqlite3_dbstat_register(sqlite3*);
1926 sqlite3_dbstat_register(p->db);
1927 }
1928 #endif
1929 globalDb = p->db;
1930 if( p->db && sqlite3_errcode(p->db)==SQLITE_OK ){
1931 sqlite3_create_function(p->db, "shellstatic", 0, SQLITE_UTF8, 0,
1932 shellstaticFunc, 0, 0);
1933 }
1934
--- src/shell.c
+++ src/shell.c
@@ -1918,16 +1918,10 @@
1918 */
1919 static void open_db(ShellState *p, int keepAlive){
1920 if( p->db==0 ){
1921 sqlite3_initialize();
1922 sqlite3_open(p->zDbFilename, &p->db);
 
 
 
 
 
 
1923 globalDb = p->db;
1924 if( p->db && sqlite3_errcode(p->db)==SQLITE_OK ){
1925 sqlite3_create_function(p->db, "shellstatic", 0, SQLITE_UTF8, 0,
1926 shellstaticFunc, 0, 0);
1927 }
1928
M src/sqlite3.c
+1 -2
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -318,11 +318,11 @@
318318
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
319319
 ** [sqlite_version()] and [sqlite_source_id()].
320320
 */
321321
 #define SQLITE_VERSION "3.8.10"
322322
 #define SQLITE_VERSION_NUMBER 3008010
323
-#define SQLITE_SOURCE_ID "2015-05-05 18:52:54 04afa3febee32854fbb09ef8d4ffffd432119716"
323
+#define SQLITE_SOURCE_ID "2015-05-07 11:53:08 cf975957b9ae671f34bb65f049acf351e650d437"
324324
325325
 /*
326326
 ** CAPI3REF: Run-Time Library Version Numbers
327327
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
328328
 **
@@ -81389,11 +81389,10 @@
8138981389
 sqlite3 *db; /* The database connection */
8139081390
8139181391
 assert( iCol>=0 && iCol<pEList->nExpr );
8139281392
 pOrig = pEList->a[iCol].pExpr;
8139381393
 assert( pOrig!=0 );
81394
- assert( (pOrig->flags & EP_Resolved)!=0 || zType[0]==0 );
8139581394
 db = pParse->db;
8139681395
 pDup = sqlite3ExprDup(db, pOrig, 0);
8139781396
 if( pDup==0 ) return;
8139881397
 if( pOrig->op!=TK_COLUMN && zType[0]!='G' ){
8139981398
 incrAggFunctionDepth(pDup, nSubquery);
8140081399
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -318,11 +318,11 @@
318 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
319 ** [sqlite_version()] and [sqlite_source_id()].
320 */
321 #define SQLITE_VERSION "3.8.10"
322 #define SQLITE_VERSION_NUMBER 3008010
323 #define SQLITE_SOURCE_ID "2015-05-05 18:52:54 04afa3febee32854fbb09ef8d4ffffd432119716"
324
325 /*
326 ** CAPI3REF: Run-Time Library Version Numbers
327 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
328 **
@@ -81389,11 +81389,10 @@
81389 sqlite3 *db; /* The database connection */
81390
81391 assert( iCol>=0 && iCol<pEList->nExpr );
81392 pOrig = pEList->a[iCol].pExpr;
81393 assert( pOrig!=0 );
81394 assert( (pOrig->flags & EP_Resolved)!=0 || zType[0]==0 );
81395 db = pParse->db;
81396 pDup = sqlite3ExprDup(db, pOrig, 0);
81397 if( pDup==0 ) return;
81398 if( pOrig->op!=TK_COLUMN && zType[0]!='G' ){
81399 incrAggFunctionDepth(pDup, nSubquery);
81400
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -318,11 +318,11 @@
318 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
319 ** [sqlite_version()] and [sqlite_source_id()].
320 */
321 #define SQLITE_VERSION "3.8.10"
322 #define SQLITE_VERSION_NUMBER 3008010
323 #define SQLITE_SOURCE_ID "2015-05-07 11:53:08 cf975957b9ae671f34bb65f049acf351e650d437"
324
325 /*
326 ** CAPI3REF: Run-Time Library Version Numbers
327 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
328 **
@@ -81389,11 +81389,10 @@
81389 sqlite3 *db; /* The database connection */
81390
81391 assert( iCol>=0 && iCol<pEList->nExpr );
81392 pOrig = pEList->a[iCol].pExpr;
81393 assert( pOrig!=0 );
 
81394 db = pParse->db;
81395 pDup = sqlite3ExprDup(db, pOrig, 0);
81396 if( pDup==0 ) return;
81397 if( pOrig->op!=TK_COLUMN && zType[0]!='G' ){
81398 incrAggFunctionDepth(pDup, nSubquery);
81399
M src/sqlite3.h
+1 -1
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -111,11 +111,11 @@
111111
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
112112
 ** [sqlite_version()] and [sqlite_source_id()].
113113
 */
114114
 #define SQLITE_VERSION "3.8.10"
115115
 #define SQLITE_VERSION_NUMBER 3008010
116
-#define SQLITE_SOURCE_ID "2015-05-05 18:52:54 04afa3febee32854fbb09ef8d4ffffd432119716"
116
+#define SQLITE_SOURCE_ID "2015-05-07 11:53:08 cf975957b9ae671f34bb65f049acf351e650d437"
117117
118118
 /*
119119
 ** CAPI3REF: Run-Time Library Version Numbers
120120
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
121121
 **
122122
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -111,11 +111,11 @@
111 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
112 ** [sqlite_version()] and [sqlite_source_id()].
113 */
114 #define SQLITE_VERSION "3.8.10"
115 #define SQLITE_VERSION_NUMBER 3008010
116 #define SQLITE_SOURCE_ID "2015-05-05 18:52:54 04afa3febee32854fbb09ef8d4ffffd432119716"
117
118 /*
119 ** CAPI3REF: Run-Time Library Version Numbers
120 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
121 **
122
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -111,11 +111,11 @@
111 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
112 ** [sqlite_version()] and [sqlite_source_id()].
113 */
114 #define SQLITE_VERSION "3.8.10"
115 #define SQLITE_VERSION_NUMBER 3008010
116 #define SQLITE_SOURCE_ID "2015-05-07 11:53:08 cf975957b9ae671f34bb65f049acf351e650d437"
117
118 /*
119 ** CAPI3REF: Run-Time Library Version Numbers
120 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
121 **
122

Keyboard Shortcuts

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