Fossil SCM

Update the built-in SQLite to the second beta of 3.8.10.

drh 2015-05-05 18:59 UTC show-add-by-merge
Commit 7d2ac84598adf7b2df2510b084961eaf1493c4cd
Parent 243c77e6e91078a…
2 files changed +11 -8 +1 -1
~ src/sqlite3.c ~ src/sqlite3.h
M src/sqlite3.c
+11 -8
--- 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-04 19:13:25 850c11866686a7b39d7b163fb60898c11283688e"
323
+#define SQLITE_SOURCE_ID "2015-05-05 18:52:54 04afa3febee32854fbb09ef8d4ffffd432119716"
324324
325325
 /*
326326
 ** CAPI3REF: Run-Time Library Version Numbers
327327
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
328328
 **
@@ -21590,11 +21590,10 @@
2159021590
 case '0': flag_zeropad = 1; break;
2159121591
 default: done = 1; break;
2159221592
 }
2159321593
 }while( !done && (c=(*++fmt))!=0 );
2159421594
 /* Get the field width */
21595
- width = 0;
2159621595
 if( c=='*' ){
2159721596
 if( bArgList ){
2159821597
 width = (int)getIntArg(pArgList);
2159921598
 }else{
2160021599
 width = va_arg(ap,int);
@@ -21614,11 +21613,10 @@
2161421613
 width = wx & 0x7fffffff;
2161521614
 }
2161621615
2161721616
 /* Get the precision */
2161821617
 if( c=='.' ){
21619
- precision = 0;
2162021618
 c = *++fmt;
2162121619
 if( c=='*' ){
2162221620
 if( bArgList ){
2162321621
 precision = (int)getIntArg(pArgList);
2162421622
 }else{
@@ -55477,11 +55475,11 @@
5547755475
 }
5547855476
 assert( nReserve>=0 && nReserve<=255 );
5547955477
 if( pageSize>=512 && pageSize<=SQLITE_MAX_PAGE_SIZE &&
5548055478
 ((pageSize-1)&pageSize)==0 ){
5548155479
 assert( (pageSize & 7)==0 );
55482
- assert( !pBt->pPage1 && !pBt->pCursor );
55480
+ assert( !pBt->pCursor );
5548355481
 pBt->pageSize = (u32)pageSize;
5548455482
 freeTempSpace(pBt);
5548555483
 }
5548655484
 rc = sqlite3PagerSetPagesize(pBt->pPager, &pBt->pageSize, nReserve);
5548755485
 pBt->usableSize = pBt->pageSize - (u16)nReserve;
@@ -71814,11 +71812,10 @@
7181471812
 }else{
7181571813
 assert( rc==SQLITE_OK || (p->rc&0xff)==SQLITE_CONSTRAINT );
7181671814
 assert( rc==SQLITE_OK || db->nDeferredCons>0 || db->nDeferredImmCons>0 );
7181771815
 rc = p->rc ? SQLITE_ERROR : SQLITE_DONE;
7181871816
 }
71819
- pOp = &aOp[pcx];
7182071817
 goto vdbe_return;
7182171818
 }
7182271819
7182371820
 /* Opcode: Integer P1 P2 * * *
7182471821
 ** Synopsis: r[P2]=P1
@@ -76742,11 +76739,10 @@
7674276739
 if( rc ){
7674376740
 eNew = eOld;
7674476741
 }
7674576742
 eNew = sqlite3PagerSetJournalMode(pPager, eNew);
7674676743
76747
- pOut = &aMem[pOp->p2];
7674876744
 pOut->flags = MEM_Str|MEM_Static|MEM_Term;
7674976745
 pOut->z = (char *)sqlite3JournalModename(eNew);
7675076746
 pOut->n = sqlite3Strlen30(pOut->z);
7675176747
 pOut->enc = SQLITE_UTF8;
7675276748
 sqlite3VdbeChangeEncoding(pOut, encoding);
@@ -84054,11 +84050,11 @@
8405484050
 int i;
8405584051
 u32 m = 0;
8405684052
 if( pList ){
8405784053
 for(i=0; i<pList->nExpr; i++){
8405884054
 Expr *pExpr = pList->a[i].pExpr;
84059
- if( ALWAYS(pExpr) ) m |= pList->a[i].pExpr->flags;
84055
+ if( ALWAYS(pExpr) ) m |= pExpr->flags;
8406084056
 }
8406184057
 }
8406284058
 return m;
8406384059
 }
8406484060
@@ -130865,10 +130861,17 @@
130865130861
 #ifdef SQLITE_ENABLE_RTREE
130866130862
 if( !db->mallocFailed && rc==SQLITE_OK){
130867130863
 rc = sqlite3RtreeInit(db);
130868130864
 }
130869130865
 #endif
130866
+
130867
+#ifdef SQLITE_ENABLE_DBSTAT_VTAB
130868
+ if( !db->mallocFailed && rc==SQLITE_OK){
130869
+ int sqlite3_dbstat_register(sqlite3*);
130870
+ rc = sqlite3_dbstat_register(db);
130871
+ }
130872
+#endif
130870130873
130871130874
 /* -DSQLITE_DEFAULT_LOCKING_MODE=1 makes EXCLUSIVE the default locking
130872130875
 ** mode. -DSQLITE_DEFAULT_LOCKING_MODE=0 make NORMAL the default locking
130873130876
 ** mode. Doing nothing at all also makes NORMAL the default.
130874130877
 */
@@ -155227,11 +155230,11 @@
155227155230
 ** "sqlite3_analyzer" utility. See the ../tool/spaceanal.tcl script
155228155231
 ** for an example implementation.
155229155232
 */
155230155233
155231155234
 #if (defined(SQLITE_ENABLE_DBSTAT_VTAB) || defined(SQLITE_TEST)) \
155232
- && !defined(SQLITE_OMIT_VIRTUAL_TABLE)
155235
+ && !defined(SQLITE_OMIT_VIRTUALTABLE)
155233155236
155234155237
 /*
155235155238
 ** Page paths:
155236155239
 **
155237155240
 ** The value of the 'path' column describes the path taken from the
155238155241
--- 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-04 19:13:25 850c11866686a7b39d7b163fb60898c11283688e"
324
325 /*
326 ** CAPI3REF: Run-Time Library Version Numbers
327 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
328 **
@@ -21590,11 +21590,10 @@
21590 case '0': flag_zeropad = 1; break;
21591 default: done = 1; break;
21592 }
21593 }while( !done && (c=(*++fmt))!=0 );
21594 /* Get the field width */
21595 width = 0;
21596 if( c=='*' ){
21597 if( bArgList ){
21598 width = (int)getIntArg(pArgList);
21599 }else{
21600 width = va_arg(ap,int);
@@ -21614,11 +21613,10 @@
21614 width = wx & 0x7fffffff;
21615 }
21616
21617 /* Get the precision */
21618 if( c=='.' ){
21619 precision = 0;
21620 c = *++fmt;
21621 if( c=='*' ){
21622 if( bArgList ){
21623 precision = (int)getIntArg(pArgList);
21624 }else{
@@ -55477,11 +55475,11 @@
55477 }
55478 assert( nReserve>=0 && nReserve<=255 );
55479 if( pageSize>=512 && pageSize<=SQLITE_MAX_PAGE_SIZE &&
55480 ((pageSize-1)&pageSize)==0 ){
55481 assert( (pageSize & 7)==0 );
55482 assert( !pBt->pPage1 && !pBt->pCursor );
55483 pBt->pageSize = (u32)pageSize;
55484 freeTempSpace(pBt);
55485 }
55486 rc = sqlite3PagerSetPagesize(pBt->pPager, &pBt->pageSize, nReserve);
55487 pBt->usableSize = pBt->pageSize - (u16)nReserve;
@@ -71814,11 +71812,10 @@
71814 }else{
71815 assert( rc==SQLITE_OK || (p->rc&0xff)==SQLITE_CONSTRAINT );
71816 assert( rc==SQLITE_OK || db->nDeferredCons>0 || db->nDeferredImmCons>0 );
71817 rc = p->rc ? SQLITE_ERROR : SQLITE_DONE;
71818 }
71819 pOp = &aOp[pcx];
71820 goto vdbe_return;
71821 }
71822
71823 /* Opcode: Integer P1 P2 * * *
71824 ** Synopsis: r[P2]=P1
@@ -76742,11 +76739,10 @@
76742 if( rc ){
76743 eNew = eOld;
76744 }
76745 eNew = sqlite3PagerSetJournalMode(pPager, eNew);
76746
76747 pOut = &aMem[pOp->p2];
76748 pOut->flags = MEM_Str|MEM_Static|MEM_Term;
76749 pOut->z = (char *)sqlite3JournalModename(eNew);
76750 pOut->n = sqlite3Strlen30(pOut->z);
76751 pOut->enc = SQLITE_UTF8;
76752 sqlite3VdbeChangeEncoding(pOut, encoding);
@@ -84054,11 +84050,11 @@
84054 int i;
84055 u32 m = 0;
84056 if( pList ){
84057 for(i=0; i<pList->nExpr; i++){
84058 Expr *pExpr = pList->a[i].pExpr;
84059 if( ALWAYS(pExpr) ) m |= pList->a[i].pExpr->flags;
84060 }
84061 }
84062 return m;
84063 }
84064
@@ -130865,10 +130861,17 @@
130865 #ifdef SQLITE_ENABLE_RTREE
130866 if( !db->mallocFailed && rc==SQLITE_OK){
130867 rc = sqlite3RtreeInit(db);
130868 }
130869 #endif
 
 
 
 
 
 
 
130870
130871 /* -DSQLITE_DEFAULT_LOCKING_MODE=1 makes EXCLUSIVE the default locking
130872 ** mode. -DSQLITE_DEFAULT_LOCKING_MODE=0 make NORMAL the default locking
130873 ** mode. Doing nothing at all also makes NORMAL the default.
130874 */
@@ -155227,11 +155230,11 @@
155227 ** "sqlite3_analyzer" utility. See the ../tool/spaceanal.tcl script
155228 ** for an example implementation.
155229 */
155230
155231 #if (defined(SQLITE_ENABLE_DBSTAT_VTAB) || defined(SQLITE_TEST)) \
155232 && !defined(SQLITE_OMIT_VIRTUAL_TABLE)
155233
155234 /*
155235 ** Page paths:
155236 **
155237 ** The value of the 'path' column describes the path taken from the
155238
--- 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 **
@@ -21590,11 +21590,10 @@
21590 case '0': flag_zeropad = 1; break;
21591 default: done = 1; break;
21592 }
21593 }while( !done && (c=(*++fmt))!=0 );
21594 /* Get the field width */
 
21595 if( c=='*' ){
21596 if( bArgList ){
21597 width = (int)getIntArg(pArgList);
21598 }else{
21599 width = va_arg(ap,int);
@@ -21614,11 +21613,10 @@
21613 width = wx & 0x7fffffff;
21614 }
21615
21616 /* Get the precision */
21617 if( c=='.' ){
 
21618 c = *++fmt;
21619 if( c=='*' ){
21620 if( bArgList ){
21621 precision = (int)getIntArg(pArgList);
21622 }else{
@@ -55477,11 +55475,11 @@
55475 }
55476 assert( nReserve>=0 && nReserve<=255 );
55477 if( pageSize>=512 && pageSize<=SQLITE_MAX_PAGE_SIZE &&
55478 ((pageSize-1)&pageSize)==0 ){
55479 assert( (pageSize & 7)==0 );
55480 assert( !pBt->pCursor );
55481 pBt->pageSize = (u32)pageSize;
55482 freeTempSpace(pBt);
55483 }
55484 rc = sqlite3PagerSetPagesize(pBt->pPager, &pBt->pageSize, nReserve);
55485 pBt->usableSize = pBt->pageSize - (u16)nReserve;
@@ -71814,11 +71812,10 @@
71812 }else{
71813 assert( rc==SQLITE_OK || (p->rc&0xff)==SQLITE_CONSTRAINT );
71814 assert( rc==SQLITE_OK || db->nDeferredCons>0 || db->nDeferredImmCons>0 );
71815 rc = p->rc ? SQLITE_ERROR : SQLITE_DONE;
71816 }
 
71817 goto vdbe_return;
71818 }
71819
71820 /* Opcode: Integer P1 P2 * * *
71821 ** Synopsis: r[P2]=P1
@@ -76742,11 +76739,10 @@
76739 if( rc ){
76740 eNew = eOld;
76741 }
76742 eNew = sqlite3PagerSetJournalMode(pPager, eNew);
76743
 
76744 pOut->flags = MEM_Str|MEM_Static|MEM_Term;
76745 pOut->z = (char *)sqlite3JournalModename(eNew);
76746 pOut->n = sqlite3Strlen30(pOut->z);
76747 pOut->enc = SQLITE_UTF8;
76748 sqlite3VdbeChangeEncoding(pOut, encoding);
@@ -84054,11 +84050,11 @@
84050 int i;
84051 u32 m = 0;
84052 if( pList ){
84053 for(i=0; i<pList->nExpr; i++){
84054 Expr *pExpr = pList->a[i].pExpr;
84055 if( ALWAYS(pExpr) ) m |= pExpr->flags;
84056 }
84057 }
84058 return m;
84059 }
84060
@@ -130865,10 +130861,17 @@
130861 #ifdef SQLITE_ENABLE_RTREE
130862 if( !db->mallocFailed && rc==SQLITE_OK){
130863 rc = sqlite3RtreeInit(db);
130864 }
130865 #endif
130866
130867 #ifdef SQLITE_ENABLE_DBSTAT_VTAB
130868 if( !db->mallocFailed && rc==SQLITE_OK){
130869 int sqlite3_dbstat_register(sqlite3*);
130870 rc = sqlite3_dbstat_register(db);
130871 }
130872 #endif
130873
130874 /* -DSQLITE_DEFAULT_LOCKING_MODE=1 makes EXCLUSIVE the default locking
130875 ** mode. -DSQLITE_DEFAULT_LOCKING_MODE=0 make NORMAL the default locking
130876 ** mode. Doing nothing at all also makes NORMAL the default.
130877 */
@@ -155227,11 +155230,11 @@
155230 ** "sqlite3_analyzer" utility. See the ../tool/spaceanal.tcl script
155231 ** for an example implementation.
155232 */
155233
155234 #if (defined(SQLITE_ENABLE_DBSTAT_VTAB) || defined(SQLITE_TEST)) \
155235 && !defined(SQLITE_OMIT_VIRTUALTABLE)
155236
155237 /*
155238 ** Page paths:
155239 **
155240 ** The value of the 'path' column describes the path taken from the
155241
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-04 19:13:25 850c11866686a7b39d7b163fb60898c11283688e"
116
+#define SQLITE_SOURCE_ID "2015-05-05 18:52:54 04afa3febee32854fbb09ef8d4ffffd432119716"
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-04 19:13:25 850c11866686a7b39d7b163fb60898c11283688e"
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-05 18:52:54 04afa3febee32854fbb09ef8d4ffffd432119716"
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