Fossil SCM

Update the built-in SQLite to version 3.21.0 final.

drh 2017-10-24 20:52 trunk
Commit c7e55d9cacd4c7c980e8dafb1d8f808f7fcccccd2c5e066d33f01338961655bb
Parent 7ac19afae36fce4…
2 files changed +12 -16 +1 -1
~ src/sqlite3.c ~ src/sqlite3.h
M src/sqlite3.c
+12 -16
--- 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.21.0"
11511151
 #define SQLITE_VERSION_NUMBER 3021000
1152
-#define SQLITE_SOURCE_ID "2017-10-21 17:17:17 fb3ee1b7cac09e4950e4f48b44c277e4f391cb6c8f069644732d2389ca653da4"
1152
+#define SQLITE_SOURCE_ID "2017-10-24 18:55:49 1a584e499906b5c87ec7d43d4abce641fdf017c42125b083109bc77c4de48827"
11531153
11541154
 /*
11551155
 ** CAPI3REF: Run-Time Library Version Numbers
11561156
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
11571157
 **
@@ -83591,18 +83591,13 @@
8359183591
 if( pOp->p5 & OPFLAG_ISNOOP ) break;
8359283592
 #endif
8359383593
8359483594
 if( pOp->p5 & OPFLAG_NCHANGE ) p->nChange++;
8359583595
 if( pOp->p5 & OPFLAG_LASTROWID ) db->lastRowid = x.nKey;
83596
- if( pData->flags & MEM_Null ){
83597
- x.pData = 0;
83598
- x.nData = 0;
83599
- }else{
83600
- assert( pData->flags & (MEM_Blob|MEM_Str) );
83601
- x.pData = pData->z;
83602
- x.nData = pData->n;
83603
- }
83596
+ assert( pData->flags & (MEM_Blob|MEM_Str) );
83597
+ x.pData = pData->z;
83598
+ x.nData = pData->n;
8360483599
 seekResult = ((pOp->p5 & OPFLAG_USESEEKRESULT) ? pC->seekResult : 0);
8360583600
 if( pData->flags & MEM_Zero ){
8360683601
 x.nZero = pData->u.nZero;
8360783602
 }else{
8360883603
 x.nZero = 0;
@@ -86469,15 +86464,16 @@
8646986464
 */
8647086465
 v->aMem[1].flags = MEM_Int;
8647186466
 v->aMem[1].u.i = iRow;
8647286467
8647386468
 /* If the statement has been run before (and is paused at the OP_ResultRow)
86474
- ** then back it up to the point where it does the OP_SeekRowid. This could
86469
+ ** then back it up to the point where it does the OP_NotExists. This could
8647586470
 ** have been down with an extra OP_Goto, but simply setting the program
8647686471
 ** counter is faster. */
86477
- if( v->pc>3 ){
86478
- v->pc = 3;
86472
+ if( v->pc>4 ){
86473
+ v->pc = 4;
86474
+ assert( v->aOp[v->pc].opcode==OP_NotExists );
8647986475
 rc = sqlite3VdbeExec(v);
8648086476
 }else{
8648186477
 rc = sqlite3_step(p->pStmt);
8648286478
 }
8648386479
 if( rc==SQLITE_ROW ){
@@ -94481,11 +94477,11 @@
9448194477
 }
9448294478
9448394479
 /* Loop through each expression in <exprlist>. */
9448494480
 r1 = sqlite3GetTempReg(pParse);
9448594481
 r2 = sqlite3GetTempReg(pParse);
94486
- if( isRowid ) sqlite3VdbeAddOp2(v, OP_Null, 0, r2);
94482
+ if( isRowid ) sqlite3VdbeAddOp4(v, OP_Blob, 0, r2, 0, "", P4_STATIC);
9448794483
 for(i=pList->nExpr, pItem=pList->a; i>0; i--, pItem++){
9448894484
 Expr *pE2 = pItem->pExpr;
9448994485
 int iValToIns;
9449094486
9449194487
 /* If the expression is not constant then we will need to
@@ -201077,11 +201073,11 @@
201077201073
 int nArg, /* Number of args */
201078201074
 sqlite3_value **apUnused /* Function arguments */
201079201075
 ){
201080201076
 assert( nArg==0 );
201081201077
 UNUSED_PARAM2(nArg, apUnused);
201082
- sqlite3_result_text(pCtx, "fts5: 2017-10-19 15:17:38 04925dee41a21ffca9a9f9df27d8165431668c42c2b33d08b077fdb28011170b", -1, SQLITE_TRANSIENT);
201078
+ sqlite3_result_text(pCtx, "fts5: 2017-10-24 18:55:49 1a584e499906b5c87ec7d43d4abce641fdf017c42125b083109bc77c4de48827", -1, SQLITE_TRANSIENT);
201083201079
 }
201084201080
201085201081
 static int fts5Init(sqlite3 *db){
201086201082
 static const sqlite3_module fts5Mod = {
201087201083
 /* iVersion */ 2,
@@ -205345,12 +205341,12 @@
205345205341
 }
205346205342
 #endif /* SQLITE_CORE */
205347205343
 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
205348205344
205349205345
 /************** End of stmt.c ************************************************/
205350
-#if __LINE__!=205350
205346
+#if __LINE__!=205346
205351205347
 #undef SQLITE_SOURCE_ID
205352
-#define SQLITE_SOURCE_ID "2017-10-21 17:17:17 fb3ee1b7cac09e4950e4f48b44c277e4f391cb6c8f069644732d2389ca65alt2"
205348
+#define SQLITE_SOURCE_ID "2017-10-24 18:55:49 1a584e499906b5c87ec7d43d4abce641fdf017c42125b083109bc77c4de4alt2"
205353205349
 #endif
205354205350
 /* Return the source-id for this library */
205355205351
 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
205356205352
 /************************** End of sqlite3.c ******************************/
205357205353
--- 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.21.0"
1151 #define SQLITE_VERSION_NUMBER 3021000
1152 #define SQLITE_SOURCE_ID "2017-10-21 17:17:17 fb3ee1b7cac09e4950e4f48b44c277e4f391cb6c8f069644732d2389ca653da4"
1153
1154 /*
1155 ** CAPI3REF: Run-Time Library Version Numbers
1156 ** KEYWORDS: sqlite3_version sqlite3_sourceid
1157 **
@@ -83591,18 +83591,13 @@
83591 if( pOp->p5 & OPFLAG_ISNOOP ) break;
83592 #endif
83593
83594 if( pOp->p5 & OPFLAG_NCHANGE ) p->nChange++;
83595 if( pOp->p5 & OPFLAG_LASTROWID ) db->lastRowid = x.nKey;
83596 if( pData->flags & MEM_Null ){
83597 x.pData = 0;
83598 x.nData = 0;
83599 }else{
83600 assert( pData->flags & (MEM_Blob|MEM_Str) );
83601 x.pData = pData->z;
83602 x.nData = pData->n;
83603 }
83604 seekResult = ((pOp->p5 & OPFLAG_USESEEKRESULT) ? pC->seekResult : 0);
83605 if( pData->flags & MEM_Zero ){
83606 x.nZero = pData->u.nZero;
83607 }else{
83608 x.nZero = 0;
@@ -86469,15 +86464,16 @@
86469 */
86470 v->aMem[1].flags = MEM_Int;
86471 v->aMem[1].u.i = iRow;
86472
86473 /* If the statement has been run before (and is paused at the OP_ResultRow)
86474 ** then back it up to the point where it does the OP_SeekRowid. This could
86475 ** have been down with an extra OP_Goto, but simply setting the program
86476 ** counter is faster. */
86477 if( v->pc>3 ){
86478 v->pc = 3;
 
86479 rc = sqlite3VdbeExec(v);
86480 }else{
86481 rc = sqlite3_step(p->pStmt);
86482 }
86483 if( rc==SQLITE_ROW ){
@@ -94481,11 +94477,11 @@
94481 }
94482
94483 /* Loop through each expression in <exprlist>. */
94484 r1 = sqlite3GetTempReg(pParse);
94485 r2 = sqlite3GetTempReg(pParse);
94486 if( isRowid ) sqlite3VdbeAddOp2(v, OP_Null, 0, r2);
94487 for(i=pList->nExpr, pItem=pList->a; i>0; i--, pItem++){
94488 Expr *pE2 = pItem->pExpr;
94489 int iValToIns;
94490
94491 /* If the expression is not constant then we will need to
@@ -201077,11 +201073,11 @@
201077 int nArg, /* Number of args */
201078 sqlite3_value **apUnused /* Function arguments */
201079 ){
201080 assert( nArg==0 );
201081 UNUSED_PARAM2(nArg, apUnused);
201082 sqlite3_result_text(pCtx, "fts5: 2017-10-19 15:17:38 04925dee41a21ffca9a9f9df27d8165431668c42c2b33d08b077fdb28011170b", -1, SQLITE_TRANSIENT);
201083 }
201084
201085 static int fts5Init(sqlite3 *db){
201086 static const sqlite3_module fts5Mod = {
201087 /* iVersion */ 2,
@@ -205345,12 +205341,12 @@
205345 }
205346 #endif /* SQLITE_CORE */
205347 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
205348
205349 /************** End of stmt.c ************************************************/
205350 #if __LINE__!=205350
205351 #undef SQLITE_SOURCE_ID
205352 #define SQLITE_SOURCE_ID "2017-10-21 17:17:17 fb3ee1b7cac09e4950e4f48b44c277e4f391cb6c8f069644732d2389ca65alt2"
205353 #endif
205354 /* Return the source-id for this library */
205355 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
205356 /************************** End of sqlite3.c ******************************/
205357
--- 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.21.0"
1151 #define SQLITE_VERSION_NUMBER 3021000
1152 #define SQLITE_SOURCE_ID "2017-10-24 18:55:49 1a584e499906b5c87ec7d43d4abce641fdf017c42125b083109bc77c4de48827"
1153
1154 /*
1155 ** CAPI3REF: Run-Time Library Version Numbers
1156 ** KEYWORDS: sqlite3_version sqlite3_sourceid
1157 **
@@ -83591,18 +83591,13 @@
83591 if( pOp->p5 & OPFLAG_ISNOOP ) break;
83592 #endif
83593
83594 if( pOp->p5 & OPFLAG_NCHANGE ) p->nChange++;
83595 if( pOp->p5 & OPFLAG_LASTROWID ) db->lastRowid = x.nKey;
83596 assert( pData->flags & (MEM_Blob|MEM_Str) );
83597 x.pData = pData->z;
83598 x.nData = pData->n;
 
 
 
 
 
83599 seekResult = ((pOp->p5 & OPFLAG_USESEEKRESULT) ? pC->seekResult : 0);
83600 if( pData->flags & MEM_Zero ){
83601 x.nZero = pData->u.nZero;
83602 }else{
83603 x.nZero = 0;
@@ -86469,15 +86464,16 @@
86464 */
86465 v->aMem[1].flags = MEM_Int;
86466 v->aMem[1].u.i = iRow;
86467
86468 /* If the statement has been run before (and is paused at the OP_ResultRow)
86469 ** then back it up to the point where it does the OP_NotExists. This could
86470 ** have been down with an extra OP_Goto, but simply setting the program
86471 ** counter is faster. */
86472 if( v->pc>4 ){
86473 v->pc = 4;
86474 assert( v->aOp[v->pc].opcode==OP_NotExists );
86475 rc = sqlite3VdbeExec(v);
86476 }else{
86477 rc = sqlite3_step(p->pStmt);
86478 }
86479 if( rc==SQLITE_ROW ){
@@ -94481,11 +94477,11 @@
94477 }
94478
94479 /* Loop through each expression in <exprlist>. */
94480 r1 = sqlite3GetTempReg(pParse);
94481 r2 = sqlite3GetTempReg(pParse);
94482 if( isRowid ) sqlite3VdbeAddOp4(v, OP_Blob, 0, r2, 0, "", P4_STATIC);
94483 for(i=pList->nExpr, pItem=pList->a; i>0; i--, pItem++){
94484 Expr *pE2 = pItem->pExpr;
94485 int iValToIns;
94486
94487 /* If the expression is not constant then we will need to
@@ -201077,11 +201073,11 @@
201073 int nArg, /* Number of args */
201074 sqlite3_value **apUnused /* Function arguments */
201075 ){
201076 assert( nArg==0 );
201077 UNUSED_PARAM2(nArg, apUnused);
201078 sqlite3_result_text(pCtx, "fts5: 2017-10-24 18:55:49 1a584e499906b5c87ec7d43d4abce641fdf017c42125b083109bc77c4de48827", -1, SQLITE_TRANSIENT);
201079 }
201080
201081 static int fts5Init(sqlite3 *db){
201082 static const sqlite3_module fts5Mod = {
201083 /* iVersion */ 2,
@@ -205345,12 +205341,12 @@
205341 }
205342 #endif /* SQLITE_CORE */
205343 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
205344
205345 /************** End of stmt.c ************************************************/
205346 #if __LINE__!=205346
205347 #undef SQLITE_SOURCE_ID
205348 #define SQLITE_SOURCE_ID "2017-10-24 18:55:49 1a584e499906b5c87ec7d43d4abce641fdf017c42125b083109bc77c4de4alt2"
205349 #endif
205350 /* Return the source-id for this library */
205351 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
205352 /************************** End of sqlite3.c ******************************/
205353
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.21.0"
127127
 #define SQLITE_VERSION_NUMBER 3021000
128
-#define SQLITE_SOURCE_ID "2017-10-21 17:17:17 fb3ee1b7cac09e4950e4f48b44c277e4f391cb6c8f069644732d2389ca653da4"
128
+#define SQLITE_SOURCE_ID "2017-10-24 18:55:49 1a584e499906b5c87ec7d43d4abce641fdf017c42125b083109bc77c4de48827"
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.21.0"
127 #define SQLITE_VERSION_NUMBER 3021000
128 #define SQLITE_SOURCE_ID "2017-10-21 17:17:17 fb3ee1b7cac09e4950e4f48b44c277e4f391cb6c8f069644732d2389ca653da4"
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.21.0"
127 #define SQLITE_VERSION_NUMBER 3021000
128 #define SQLITE_SOURCE_ID "2017-10-24 18:55:49 1a584e499906b5c87ec7d43d4abce641fdf017c42125b083109bc77c4de48827"
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