Fossil SCM

Update the built-in SQLite to the second beta for 3.10.0.

drh 2016-01-01 17:30 trunk
Commit 987a80ef06635a6e8745ec3848360bb2a93f032a
Parent d891af8385a4d4c…
2 files changed +12 -10 +1 -1
~ src/sqlite3.c ~ src/sqlite3.h
M src/sqlite3.c
+12 -10
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -325,11 +325,11 @@
325325
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
326326
 ** [sqlite_version()] and [sqlite_source_id()].
327327
 */
328328
 #define SQLITE_VERSION "3.10.0"
329329
 #define SQLITE_VERSION_NUMBER 3010000
330
-#define SQLITE_SOURCE_ID "2015-12-31 15:34:03 9c392c1019ee15f27c8e05b41246d2844f91f6c0"
330
+#define SQLITE_SOURCE_ID "2016-01-01 16:42:09 3e852804c85a5c9f4c4ffafd55d03af6d19fe5cc"
331331
332332
 /*
333333
 ** CAPI3REF: Run-Time Library Version Numbers
334334
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
335335
 **
@@ -13527,10 +13527,11 @@
1352713527
 int nTab; /* Number of previously allocated VDBE cursors */
1352813528
 int nMem; /* Number of memory cells used so far */
1352913529
 int nSet; /* Number of sets used so far */
1353013530
 int nOnce; /* Number of OP_Once instructions so far */
1353113531
 int nOpAlloc; /* Number of slots allocated for Vdbe.aOp[] */
13532
+ int szOpAlloc; /* Bytes of memory space allocated for Vdbe.aOp[] */
1353213533
 int iFixedOp; /* Never back out opcodes iFixedOp-1 or earlier */
1353313534
 int ckBase; /* Base register of data during check constraints */
1353413535
 int iSelfTab; /* Table of an index whose exprs are being coded */
1353513536
 int iCacheLevel; /* ColCache valid when aColCache[].iLevel<=iCacheLevel */
1353613537
 int iCacheCnt; /* Counter used to generate aColCache[].lru values */
@@ -63311,11 +63312,11 @@
6331163312
 rc = balance(pCur);
6331263313
 }
6331363314
6331463315
 if( rc==SQLITE_OK ){
6331563316
 if( bSkipnext ){
63316
- assert( bPreserve && pCur->iPage==iCellDepth );
63317
+ assert( bPreserve && (pCur->iPage==iCellDepth || CORRUPT_DB) );
6331763318
 assert( pPage==pCur->apPage[pCur->iPage] );
6331863319
 assert( (pPage->nCell>0 || CORRUPT_DB) && iCellIdx<=pPage->nCell );
6331963320
 pCur->eState = CURSOR_SKIPNEXT;
6332063321
 if( iCellIdx>=pPage->nCell ){
6332163322
 pCur->skipNext = -1;
@@ -67322,10 +67323,11 @@
6732267323
 p->magic = VDBE_MAGIC_INIT;
6732367324
 p->pParse = pParse;
6732467325
 assert( pParse->aLabel==0 );
6732567326
 assert( pParse->nLabel==0 );
6732667327
 assert( pParse->nOpAlloc==0 );
67328
+ assert( pParse->szOpAlloc==0 );
6732767329
 return p;
6732867330
 }
6732967331
6733067332
 /*
6733167333
 ** Change the error string stored in Vdbe.zErrMsg
@@ -67411,11 +67413,12 @@
6741167413
6741267414
 assert( nOp<=(1024/sizeof(Op)) );
6741367415
 assert( nNew>=(p->nOpAlloc+nOp) );
6741467416
 pNew = sqlite3DbRealloc(p->db, v->aOp, nNew*sizeof(Op));
6741567417
 if( pNew ){
67416
- p->nOpAlloc = sqlite3DbMallocSize(p->db, pNew)/sizeof(Op);
67418
+ p->szOpAlloc = sqlite3DbMallocSize(p->db, pNew);
67419
+ p->nOpAlloc = p->szOpAlloc/sizeof(Op);
6741767420
 v->aOp = pNew;
6741867421
 }
6741967422
 return (pNew ? SQLITE_OK : SQLITE_NOMEM);
6742067423
 }
6742167424
@@ -69136,13 +69139,12 @@
6913669139
 nMem += nCursor;
6913769140
6913869141
 /* Allocate space for memory registers, SQL variables, VDBE cursors and
6913969142
 ** an array to marshal SQL function arguments in.
6914069143
 */
69141
- zCsr = (u8*)&p->aOp[p->nOp]; /* Memory avaliable for allocation */
69142
- assert( pParse->nOpAlloc*sizeof(Op) <= 0x7fffff00 );
69143
- nFree = (pParse->nOpAlloc - p->nOp)*sizeof(p->aOp[0]); /* Available space */
69144
+ zCsr = ((u8*)p->aOp) + ROUND8(sizeof(Op)*p->nOp); /* Available space */
69145
+ nFree = pParse->szOpAlloc - ROUND8(sizeof(Op)*p->nOp); /* Size of zCsr */
6914469146
6914569147
 resolveP2Values(p, &nArg);
6914669148
 p->usesStmtJournal = (u8)(pParse->isMultiWrite && pParse->mayAbort);
6914769149
 if( pParse->explain && nMem<10 ){
6914869150
 nMem = 10;
@@ -94133,11 +94135,11 @@
9413394135
 sqlite3DeleteIndexSamples(db, p);
9413494136
 #endif
9413594137
 sqlite3ExprDelete(db, p->pPartIdxWhere);
9413694138
 sqlite3ExprListDelete(db, p->aColExpr);
9413794139
 sqlite3DbFree(db, p->zColAff);
94138
- if( p->isResized ) sqlite3DbFree(db, p->azColl);
94140
+ if( p->isResized ) sqlite3DbFree(db, (void *)p->azColl);
9413994141
 #ifdef SQLITE_ENABLE_STAT3_OR_STAT4
9414094142
 sqlite3_free(p->aiRowEst);
9414194143
 #endif
9414294144
 sqlite3DbFree(db, p);
9414394145
 }
@@ -166452,11 +166454,11 @@
166452166454
 if( pStr ){
166453166455
 pStr->pCtx = ctx;
166454166456
 jsonAppendChar(pStr, ']');
166455166457
 if( pStr->bErr ){
166456166458
 sqlite3_result_error_nomem(ctx);
166457
- if( !pStr->bStatic ) sqlite3_free(pStr->zBuf);
166459
+ assert( pStr->bStatic );
166458166460
 }else{
166459166461
 sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed,
166460166462
 pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free);
166461166463
 pStr->bStatic = 1;
166462166464
 }
@@ -166500,11 +166502,11 @@
166500166502
 pStr = (JsonString*)sqlite3_aggregate_context(ctx, 0);
166501166503
 if( pStr ){
166502166504
 jsonAppendChar(pStr, '}');
166503166505
 if( pStr->bErr ){
166504166506
 sqlite3_result_error_nomem(ctx);
166505
- if( !pStr->bStatic ) sqlite3_free(pStr->zBuf);
166507
+ assert( pStr->bStatic );
166506166508
 }else{
166507166509
 sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed,
166508166510
 pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free);
166509166511
 pStr->bStatic = 1;
166510166512
 }
@@ -182237,11 +182239,11 @@
182237182239
 sqlite3_context *pCtx, /* Function call context */
182238182240
 int nArg, /* Number of args */
182239182241
 sqlite3_value **apVal /* Function arguments */
182240182242
 ){
182241182243
 assert( nArg==0 );
182242
- sqlite3_result_text(pCtx, "fts5: 2015-12-30 14:06:22 0a99a8c4facf65ec67d8d86108c9a3f723f7cbd6", -1, SQLITE_TRANSIENT);
182244
+ sqlite3_result_text(pCtx, "fts5: 2015-12-16 19:55:57 cb22efaf50d83d9a73fdf8d986e6ea2fc6500cfb", -1, SQLITE_TRANSIENT);
182243182245
 }
182244182246
182245182247
 static int fts5Init(sqlite3 *db){
182246182248
 static const sqlite3_module fts5Mod = {
182247182249
 /* iVersion */ 2,
182248182250
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -325,11 +325,11 @@
325 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
326 ** [sqlite_version()] and [sqlite_source_id()].
327 */
328 #define SQLITE_VERSION "3.10.0"
329 #define SQLITE_VERSION_NUMBER 3010000
330 #define SQLITE_SOURCE_ID "2015-12-31 15:34:03 9c392c1019ee15f27c8e05b41246d2844f91f6c0"
331
332 /*
333 ** CAPI3REF: Run-Time Library Version Numbers
334 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
335 **
@@ -13527,10 +13527,11 @@
13527 int nTab; /* Number of previously allocated VDBE cursors */
13528 int nMem; /* Number of memory cells used so far */
13529 int nSet; /* Number of sets used so far */
13530 int nOnce; /* Number of OP_Once instructions so far */
13531 int nOpAlloc; /* Number of slots allocated for Vdbe.aOp[] */
 
13532 int iFixedOp; /* Never back out opcodes iFixedOp-1 or earlier */
13533 int ckBase; /* Base register of data during check constraints */
13534 int iSelfTab; /* Table of an index whose exprs are being coded */
13535 int iCacheLevel; /* ColCache valid when aColCache[].iLevel<=iCacheLevel */
13536 int iCacheCnt; /* Counter used to generate aColCache[].lru values */
@@ -63311,11 +63312,11 @@
63311 rc = balance(pCur);
63312 }
63313
63314 if( rc==SQLITE_OK ){
63315 if( bSkipnext ){
63316 assert( bPreserve && pCur->iPage==iCellDepth );
63317 assert( pPage==pCur->apPage[pCur->iPage] );
63318 assert( (pPage->nCell>0 || CORRUPT_DB) && iCellIdx<=pPage->nCell );
63319 pCur->eState = CURSOR_SKIPNEXT;
63320 if( iCellIdx>=pPage->nCell ){
63321 pCur->skipNext = -1;
@@ -67322,10 +67323,11 @@
67322 p->magic = VDBE_MAGIC_INIT;
67323 p->pParse = pParse;
67324 assert( pParse->aLabel==0 );
67325 assert( pParse->nLabel==0 );
67326 assert( pParse->nOpAlloc==0 );
 
67327 return p;
67328 }
67329
67330 /*
67331 ** Change the error string stored in Vdbe.zErrMsg
@@ -67411,11 +67413,12 @@
67411
67412 assert( nOp<=(1024/sizeof(Op)) );
67413 assert( nNew>=(p->nOpAlloc+nOp) );
67414 pNew = sqlite3DbRealloc(p->db, v->aOp, nNew*sizeof(Op));
67415 if( pNew ){
67416 p->nOpAlloc = sqlite3DbMallocSize(p->db, pNew)/sizeof(Op);
 
67417 v->aOp = pNew;
67418 }
67419 return (pNew ? SQLITE_OK : SQLITE_NOMEM);
67420 }
67421
@@ -69136,13 +69139,12 @@
69136 nMem += nCursor;
69137
69138 /* Allocate space for memory registers, SQL variables, VDBE cursors and
69139 ** an array to marshal SQL function arguments in.
69140 */
69141 zCsr = (u8*)&p->aOp[p->nOp]; /* Memory avaliable for allocation */
69142 assert( pParse->nOpAlloc*sizeof(Op) <= 0x7fffff00 );
69143 nFree = (pParse->nOpAlloc - p->nOp)*sizeof(p->aOp[0]); /* Available space */
69144
69145 resolveP2Values(p, &nArg);
69146 p->usesStmtJournal = (u8)(pParse->isMultiWrite && pParse->mayAbort);
69147 if( pParse->explain && nMem<10 ){
69148 nMem = 10;
@@ -94133,11 +94135,11 @@
94133 sqlite3DeleteIndexSamples(db, p);
94134 #endif
94135 sqlite3ExprDelete(db, p->pPartIdxWhere);
94136 sqlite3ExprListDelete(db, p->aColExpr);
94137 sqlite3DbFree(db, p->zColAff);
94138 if( p->isResized ) sqlite3DbFree(db, p->azColl);
94139 #ifdef SQLITE_ENABLE_STAT3_OR_STAT4
94140 sqlite3_free(p->aiRowEst);
94141 #endif
94142 sqlite3DbFree(db, p);
94143 }
@@ -166452,11 +166454,11 @@
166452 if( pStr ){
166453 pStr->pCtx = ctx;
166454 jsonAppendChar(pStr, ']');
166455 if( pStr->bErr ){
166456 sqlite3_result_error_nomem(ctx);
166457 if( !pStr->bStatic ) sqlite3_free(pStr->zBuf);
166458 }else{
166459 sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed,
166460 pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free);
166461 pStr->bStatic = 1;
166462 }
@@ -166500,11 +166502,11 @@
166500 pStr = (JsonString*)sqlite3_aggregate_context(ctx, 0);
166501 if( pStr ){
166502 jsonAppendChar(pStr, '}');
166503 if( pStr->bErr ){
166504 sqlite3_result_error_nomem(ctx);
166505 if( !pStr->bStatic ) sqlite3_free(pStr->zBuf);
166506 }else{
166507 sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed,
166508 pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free);
166509 pStr->bStatic = 1;
166510 }
@@ -182237,11 +182239,11 @@
182237 sqlite3_context *pCtx, /* Function call context */
182238 int nArg, /* Number of args */
182239 sqlite3_value **apVal /* Function arguments */
182240 ){
182241 assert( nArg==0 );
182242 sqlite3_result_text(pCtx, "fts5: 2015-12-30 14:06:22 0a99a8c4facf65ec67d8d86108c9a3f723f7cbd6", -1, SQLITE_TRANSIENT);
182243 }
182244
182245 static int fts5Init(sqlite3 *db){
182246 static const sqlite3_module fts5Mod = {
182247 /* iVersion */ 2,
182248
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -325,11 +325,11 @@
325 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
326 ** [sqlite_version()] and [sqlite_source_id()].
327 */
328 #define SQLITE_VERSION "3.10.0"
329 #define SQLITE_VERSION_NUMBER 3010000
330 #define SQLITE_SOURCE_ID "2016-01-01 16:42:09 3e852804c85a5c9f4c4ffafd55d03af6d19fe5cc"
331
332 /*
333 ** CAPI3REF: Run-Time Library Version Numbers
334 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
335 **
@@ -13527,10 +13527,11 @@
13527 int nTab; /* Number of previously allocated VDBE cursors */
13528 int nMem; /* Number of memory cells used so far */
13529 int nSet; /* Number of sets used so far */
13530 int nOnce; /* Number of OP_Once instructions so far */
13531 int nOpAlloc; /* Number of slots allocated for Vdbe.aOp[] */
13532 int szOpAlloc; /* Bytes of memory space allocated for Vdbe.aOp[] */
13533 int iFixedOp; /* Never back out opcodes iFixedOp-1 or earlier */
13534 int ckBase; /* Base register of data during check constraints */
13535 int iSelfTab; /* Table of an index whose exprs are being coded */
13536 int iCacheLevel; /* ColCache valid when aColCache[].iLevel<=iCacheLevel */
13537 int iCacheCnt; /* Counter used to generate aColCache[].lru values */
@@ -63311,11 +63312,11 @@
63312 rc = balance(pCur);
63313 }
63314
63315 if( rc==SQLITE_OK ){
63316 if( bSkipnext ){
63317 assert( bPreserve && (pCur->iPage==iCellDepth || CORRUPT_DB) );
63318 assert( pPage==pCur->apPage[pCur->iPage] );
63319 assert( (pPage->nCell>0 || CORRUPT_DB) && iCellIdx<=pPage->nCell );
63320 pCur->eState = CURSOR_SKIPNEXT;
63321 if( iCellIdx>=pPage->nCell ){
63322 pCur->skipNext = -1;
@@ -67322,10 +67323,11 @@
67323 p->magic = VDBE_MAGIC_INIT;
67324 p->pParse = pParse;
67325 assert( pParse->aLabel==0 );
67326 assert( pParse->nLabel==0 );
67327 assert( pParse->nOpAlloc==0 );
67328 assert( pParse->szOpAlloc==0 );
67329 return p;
67330 }
67331
67332 /*
67333 ** Change the error string stored in Vdbe.zErrMsg
@@ -67411,11 +67413,12 @@
67413
67414 assert( nOp<=(1024/sizeof(Op)) );
67415 assert( nNew>=(p->nOpAlloc+nOp) );
67416 pNew = sqlite3DbRealloc(p->db, v->aOp, nNew*sizeof(Op));
67417 if( pNew ){
67418 p->szOpAlloc = sqlite3DbMallocSize(p->db, pNew);
67419 p->nOpAlloc = p->szOpAlloc/sizeof(Op);
67420 v->aOp = pNew;
67421 }
67422 return (pNew ? SQLITE_OK : SQLITE_NOMEM);
67423 }
67424
@@ -69136,13 +69139,12 @@
69139 nMem += nCursor;
69140
69141 /* Allocate space for memory registers, SQL variables, VDBE cursors and
69142 ** an array to marshal SQL function arguments in.
69143 */
69144 zCsr = ((u8*)p->aOp) + ROUND8(sizeof(Op)*p->nOp); /* Available space */
69145 nFree = pParse->szOpAlloc - ROUND8(sizeof(Op)*p->nOp); /* Size of zCsr */
 
69146
69147 resolveP2Values(p, &nArg);
69148 p->usesStmtJournal = (u8)(pParse->isMultiWrite && pParse->mayAbort);
69149 if( pParse->explain && nMem<10 ){
69150 nMem = 10;
@@ -94133,11 +94135,11 @@
94135 sqlite3DeleteIndexSamples(db, p);
94136 #endif
94137 sqlite3ExprDelete(db, p->pPartIdxWhere);
94138 sqlite3ExprListDelete(db, p->aColExpr);
94139 sqlite3DbFree(db, p->zColAff);
94140 if( p->isResized ) sqlite3DbFree(db, (void *)p->azColl);
94141 #ifdef SQLITE_ENABLE_STAT3_OR_STAT4
94142 sqlite3_free(p->aiRowEst);
94143 #endif
94144 sqlite3DbFree(db, p);
94145 }
@@ -166452,11 +166454,11 @@
166454 if( pStr ){
166455 pStr->pCtx = ctx;
166456 jsonAppendChar(pStr, ']');
166457 if( pStr->bErr ){
166458 sqlite3_result_error_nomem(ctx);
166459 assert( pStr->bStatic );
166460 }else{
166461 sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed,
166462 pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free);
166463 pStr->bStatic = 1;
166464 }
@@ -166500,11 +166502,11 @@
166502 pStr = (JsonString*)sqlite3_aggregate_context(ctx, 0);
166503 if( pStr ){
166504 jsonAppendChar(pStr, '}');
166505 if( pStr->bErr ){
166506 sqlite3_result_error_nomem(ctx);
166507 assert( pStr->bStatic );
166508 }else{
166509 sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed,
166510 pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free);
166511 pStr->bStatic = 1;
166512 }
@@ -182237,11 +182239,11 @@
182239 sqlite3_context *pCtx, /* Function call context */
182240 int nArg, /* Number of args */
182241 sqlite3_value **apVal /* Function arguments */
182242 ){
182243 assert( nArg==0 );
182244 sqlite3_result_text(pCtx, "fts5: 2015-12-16 19:55:57 cb22efaf50d83d9a73fdf8d986e6ea2fc6500cfb", -1, SQLITE_TRANSIENT);
182245 }
182246
182247 static int fts5Init(sqlite3 *db){
182248 static const sqlite3_module fts5Mod = {
182249 /* iVersion */ 2,
182250
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.10.0"
115115
 #define SQLITE_VERSION_NUMBER 3010000
116
-#define SQLITE_SOURCE_ID "2015-12-31 15:34:03 9c392c1019ee15f27c8e05b41246d2844f91f6c0"
116
+#define SQLITE_SOURCE_ID "2016-01-01 16:42:09 3e852804c85a5c9f4c4ffafd55d03af6d19fe5cc"
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.10.0"
115 #define SQLITE_VERSION_NUMBER 3010000
116 #define SQLITE_SOURCE_ID "2015-12-31 15:34:03 9c392c1019ee15f27c8e05b41246d2844f91f6c0"
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.10.0"
115 #define SQLITE_VERSION_NUMBER 3010000
116 #define SQLITE_SOURCE_ID "2016-01-01 16:42:09 3e852804c85a5c9f4c4ffafd55d03af6d19fe5cc"
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