Fossil SCM
Update the built-in SQLite to version 3.8.6
Commit
ee46563cbdc28face0215bc1a5cf81f0b589d88a
Parent
38421a9c998347c…
2 files changed
+5
-4
+1
-1
+5
-4
| --- src/sqlite3.c | ||
| +++ src/sqlite3.c | ||
| @@ -222,11 +222,11 @@ | ||
| 222 | 222 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 223 | 223 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 224 | 224 | */ |
| 225 | 225 | #define SQLITE_VERSION "3.8.6" |
| 226 | 226 | #define SQLITE_VERSION_NUMBER 3008006 |
| 227 | -#define SQLITE_SOURCE_ID "2014-08-12 16:13:37 6715991296886c2a02b9a285a1e61189ad1f79c0" | |
| 227 | +#define SQLITE_SOURCE_ID "2014-08-15 11:46:33 9491ba7d738528f168657adb43a198238abde19e" | |
| 228 | 228 | |
| 229 | 229 | /* |
| 230 | 230 | ** CAPI3REF: Run-Time Library Version Numbers |
| 231 | 231 | ** KEYWORDS: sqlite3_version, sqlite3_sourceid |
| 232 | 232 | ** |
| @@ -57278,11 +57278,12 @@ | ||
| 57278 | 57278 | int nSkip = (iChild ? 4 : 0); |
| 57279 | 57279 | |
| 57280 | 57280 | if( *pRC ) return; |
| 57281 | 57281 | |
| 57282 | 57282 | assert( i>=0 && i<=pPage->nCell+pPage->nOverflow ); |
| 57283 | - assert( pPage->nCell<=MX_CELL(pPage->pBt) && MX_CELL(pPage->pBt)<=10921 ); | |
| 57283 | + assert( MX_CELL(pPage->pBt)<=10921 ); | |
| 57284 | + assert( pPage->nCell<=MX_CELL(pPage->pBt) || CORRUPT_DB ); | |
| 57284 | 57285 | assert( pPage->nOverflow<=ArraySize(pPage->apOvfl) ); |
| 57285 | 57286 | assert( ArraySize(pPage->apOvfl)==ArraySize(pPage->aiOvfl) ); |
| 57286 | 57287 | assert( sqlite3_mutex_held(pPage->pBt->mutex) ); |
| 57287 | 57288 | /* The cell should normally be sized correctly. However, when moving a |
| 57288 | 57289 | ** malformed cell from a leaf page to an interior page, if the cell size |
| @@ -71519,11 +71520,11 @@ | ||
| 71519 | 71520 | ** Reposition cursor P1 so that it points to the smallest entry that |
| 71520 | 71521 | ** is greater than the key value. If there are no records greater than |
| 71521 | 71522 | ** the key and P2 is not zero, then jump to P2. |
| 71522 | 71523 | ** |
| 71523 | 71524 | ** This opcode leaves the cursor configured to move in forward order, |
| 71524 | -** from the begining toward the end. In other words, the cursor is | |
| 71525 | +** from the beginning toward the end. In other words, the cursor is | |
| 71525 | 71526 | ** configured to use Next, not Prev. |
| 71526 | 71527 | ** |
| 71527 | 71528 | ** See also: Found, NotFound, SeekLt, SeekGe, SeekLe |
| 71528 | 71529 | */ |
| 71529 | 71530 | /* Opcode: SeekLT P1 P2 P3 P4 * |
| @@ -72536,11 +72537,11 @@ | ||
| 72536 | 72537 | ** If the table or index is empty and P2>0, then jump immediately to P2. |
| 72537 | 72538 | ** If P2 is 0 or if the table or index is not empty, fall through |
| 72538 | 72539 | ** to the following instruction. |
| 72539 | 72540 | ** |
| 72540 | 72541 | ** This opcode leaves the cursor configured to move in forward order, |
| 72541 | -** from the begining toward the end. In other words, the cursor is | |
| 72542 | +** from the beginning toward the end. In other words, the cursor is | |
| 72542 | 72543 | ** configured to use Next, not Prev. |
| 72543 | 72544 | */ |
| 72544 | 72545 | case OP_Rewind: { /* jump */ |
| 72545 | 72546 | VdbeCursor *pC; |
| 72546 | 72547 | BtCursor *pCrsr; |
| 72547 | 72548 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -222,11 +222,11 @@ | |
| 222 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 223 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 224 | */ |
| 225 | #define SQLITE_VERSION "3.8.6" |
| 226 | #define SQLITE_VERSION_NUMBER 3008006 |
| 227 | #define SQLITE_SOURCE_ID "2014-08-12 16:13:37 6715991296886c2a02b9a285a1e61189ad1f79c0" |
| 228 | |
| 229 | /* |
| 230 | ** CAPI3REF: Run-Time Library Version Numbers |
| 231 | ** KEYWORDS: sqlite3_version, sqlite3_sourceid |
| 232 | ** |
| @@ -57278,11 +57278,12 @@ | |
| 57278 | int nSkip = (iChild ? 4 : 0); |
| 57279 | |
| 57280 | if( *pRC ) return; |
| 57281 | |
| 57282 | assert( i>=0 && i<=pPage->nCell+pPage->nOverflow ); |
| 57283 | assert( pPage->nCell<=MX_CELL(pPage->pBt) && MX_CELL(pPage->pBt)<=10921 ); |
| 57284 | assert( pPage->nOverflow<=ArraySize(pPage->apOvfl) ); |
| 57285 | assert( ArraySize(pPage->apOvfl)==ArraySize(pPage->aiOvfl) ); |
| 57286 | assert( sqlite3_mutex_held(pPage->pBt->mutex) ); |
| 57287 | /* The cell should normally be sized correctly. However, when moving a |
| 57288 | ** malformed cell from a leaf page to an interior page, if the cell size |
| @@ -71519,11 +71520,11 @@ | |
| 71519 | ** Reposition cursor P1 so that it points to the smallest entry that |
| 71520 | ** is greater than the key value. If there are no records greater than |
| 71521 | ** the key and P2 is not zero, then jump to P2. |
| 71522 | ** |
| 71523 | ** This opcode leaves the cursor configured to move in forward order, |
| 71524 | ** from the begining toward the end. In other words, the cursor is |
| 71525 | ** configured to use Next, not Prev. |
| 71526 | ** |
| 71527 | ** See also: Found, NotFound, SeekLt, SeekGe, SeekLe |
| 71528 | */ |
| 71529 | /* Opcode: SeekLT P1 P2 P3 P4 * |
| @@ -72536,11 +72537,11 @@ | |
| 72536 | ** If the table or index is empty and P2>0, then jump immediately to P2. |
| 72537 | ** If P2 is 0 or if the table or index is not empty, fall through |
| 72538 | ** to the following instruction. |
| 72539 | ** |
| 72540 | ** This opcode leaves the cursor configured to move in forward order, |
| 72541 | ** from the begining toward the end. In other words, the cursor is |
| 72542 | ** configured to use Next, not Prev. |
| 72543 | */ |
| 72544 | case OP_Rewind: { /* jump */ |
| 72545 | VdbeCursor *pC; |
| 72546 | BtCursor *pCrsr; |
| 72547 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -222,11 +222,11 @@ | |
| 222 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 223 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 224 | */ |
| 225 | #define SQLITE_VERSION "3.8.6" |
| 226 | #define SQLITE_VERSION_NUMBER 3008006 |
| 227 | #define SQLITE_SOURCE_ID "2014-08-15 11:46:33 9491ba7d738528f168657adb43a198238abde19e" |
| 228 | |
| 229 | /* |
| 230 | ** CAPI3REF: Run-Time Library Version Numbers |
| 231 | ** KEYWORDS: sqlite3_version, sqlite3_sourceid |
| 232 | ** |
| @@ -57278,11 +57278,12 @@ | |
| 57278 | int nSkip = (iChild ? 4 : 0); |
| 57279 | |
| 57280 | if( *pRC ) return; |
| 57281 | |
| 57282 | assert( i>=0 && i<=pPage->nCell+pPage->nOverflow ); |
| 57283 | assert( MX_CELL(pPage->pBt)<=10921 ); |
| 57284 | assert( pPage->nCell<=MX_CELL(pPage->pBt) || CORRUPT_DB ); |
| 57285 | assert( pPage->nOverflow<=ArraySize(pPage->apOvfl) ); |
| 57286 | assert( ArraySize(pPage->apOvfl)==ArraySize(pPage->aiOvfl) ); |
| 57287 | assert( sqlite3_mutex_held(pPage->pBt->mutex) ); |
| 57288 | /* The cell should normally be sized correctly. However, when moving a |
| 57289 | ** malformed cell from a leaf page to an interior page, if the cell size |
| @@ -71519,11 +71520,11 @@ | |
| 71520 | ** Reposition cursor P1 so that it points to the smallest entry that |
| 71521 | ** is greater than the key value. If there are no records greater than |
| 71522 | ** the key and P2 is not zero, then jump to P2. |
| 71523 | ** |
| 71524 | ** This opcode leaves the cursor configured to move in forward order, |
| 71525 | ** from the beginning toward the end. In other words, the cursor is |
| 71526 | ** configured to use Next, not Prev. |
| 71527 | ** |
| 71528 | ** See also: Found, NotFound, SeekLt, SeekGe, SeekLe |
| 71529 | */ |
| 71530 | /* Opcode: SeekLT P1 P2 P3 P4 * |
| @@ -72536,11 +72537,11 @@ | |
| 72537 | ** If the table or index is empty and P2>0, then jump immediately to P2. |
| 72538 | ** If P2 is 0 or if the table or index is not empty, fall through |
| 72539 | ** to the following instruction. |
| 72540 | ** |
| 72541 | ** This opcode leaves the cursor configured to move in forward order, |
| 72542 | ** from the beginning toward the end. In other words, the cursor is |
| 72543 | ** configured to use Next, not Prev. |
| 72544 | */ |
| 72545 | case OP_Rewind: { /* jump */ |
| 72546 | VdbeCursor *pC; |
| 72547 | BtCursor *pCrsr; |
| 72548 |
+1
-1
| --- src/sqlite3.h | ||
| +++ src/sqlite3.h | ||
| @@ -107,11 +107,11 @@ | ||
| 107 | 107 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 108 | 108 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 109 | 109 | */ |
| 110 | 110 | #define SQLITE_VERSION "3.8.6" |
| 111 | 111 | #define SQLITE_VERSION_NUMBER 3008006 |
| 112 | -#define SQLITE_SOURCE_ID "2014-08-12 16:13:37 6715991296886c2a02b9a285a1e61189ad1f79c0" | |
| 112 | +#define SQLITE_SOURCE_ID "2014-08-15 11:46:33 9491ba7d738528f168657adb43a198238abde19e" | |
| 113 | 113 | |
| 114 | 114 | /* |
| 115 | 115 | ** CAPI3REF: Run-Time Library Version Numbers |
| 116 | 116 | ** KEYWORDS: sqlite3_version, sqlite3_sourceid |
| 117 | 117 | ** |
| 118 | 118 |
| --- src/sqlite3.h | |
| +++ src/sqlite3.h | |
| @@ -107,11 +107,11 @@ | |
| 107 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 108 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 109 | */ |
| 110 | #define SQLITE_VERSION "3.8.6" |
| 111 | #define SQLITE_VERSION_NUMBER 3008006 |
| 112 | #define SQLITE_SOURCE_ID "2014-08-12 16:13:37 6715991296886c2a02b9a285a1e61189ad1f79c0" |
| 113 | |
| 114 | /* |
| 115 | ** CAPI3REF: Run-Time Library Version Numbers |
| 116 | ** KEYWORDS: sqlite3_version, sqlite3_sourceid |
| 117 | ** |
| 118 |
| --- src/sqlite3.h | |
| +++ src/sqlite3.h | |
| @@ -107,11 +107,11 @@ | |
| 107 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 108 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 109 | */ |
| 110 | #define SQLITE_VERSION "3.8.6" |
| 111 | #define SQLITE_VERSION_NUMBER 3008006 |
| 112 | #define SQLITE_SOURCE_ID "2014-08-15 11:46:33 9491ba7d738528f168657adb43a198238abde19e" |
| 113 | |
| 114 | /* |
| 115 | ** CAPI3REF: Run-Time Library Version Numbers |
| 116 | ** KEYWORDS: sqlite3_version, sqlite3_sourceid |
| 117 | ** |
| 118 |