Fossil SCM
Update the built-in SQLite to the 3.46.0 release.
Commit
253fc1df76130a7121f5e185e1e9e0107440fae0f952bf34ae2b7af01902dcf3
Parent
2ba99c273b03890…
3 files changed
+3
-1
+4
-4
+1
-1
+3
-1
| --- extsrc/shell.c | ||
| +++ extsrc/shell.c | ||
| @@ -15774,10 +15774,11 @@ | ||
| 15774 | 15774 | pCsr->iField = 0; |
| 15775 | 15775 | pCsr->bOnePage = 0; |
| 15776 | 15776 | sqlite3_free(pCsr->aPage); |
| 15777 | 15777 | dbdataBufferFree(&pCsr->rec); |
| 15778 | 15778 | pCsr->aPage = 0; |
| 15779 | + pCsr->nRec = 0; | |
| 15779 | 15780 | } |
| 15780 | 15781 | |
| 15781 | 15782 | /* |
| 15782 | 15783 | ** Close an sqlite_dbdata or sqlite_dbptr cursor. |
| 15783 | 15784 | */ |
| @@ -16045,10 +16046,11 @@ | ||
| 16045 | 16046 | }else{ |
| 16046 | 16047 | return SQLITE_OK; |
| 16047 | 16048 | } |
| 16048 | 16049 | }else{ |
| 16049 | 16050 | /* If there is no record loaded, load it now. */ |
| 16051 | + assert( pCsr->rec.aBuf!=0 || pCsr->nRec==0 ); | |
| 16050 | 16052 | if( pCsr->nRec==0 ){ |
| 16051 | 16053 | int bHasRowid = 0; |
| 16052 | 16054 | int nPointer = 0; |
| 16053 | 16055 | sqlite3_int64 nPayload = 0; |
| 16054 | 16056 | sqlite3_int64 nHdr = 0; |
| @@ -26047,11 +26049,11 @@ | ||
| 26047 | 26049 | int iInterval; /* Reset iCnt to this value after each fault */ |
| 26048 | 26050 | int eVerbose; /* When to print output */ |
| 26049 | 26051 | int nHit; /* Number of hits seen so far */ |
| 26050 | 26052 | int nRepeat; /* Turn off after this many hits. 0 for never */ |
| 26051 | 26053 | int nSkip; /* Skip this many before first fault */ |
| 26052 | -} faultsim_state = {-1, 0, 0, 0, 0, 0, 0}; | |
| 26054 | +} faultsim_state = {-1, 0, 0, 0, 0, 0, 0, 0}; | |
| 26053 | 26055 | |
| 26054 | 26056 | /* |
| 26055 | 26057 | ** This is the fault-sim callback |
| 26056 | 26058 | */ |
| 26057 | 26059 | static int faultsim_callback(int iArg){ |
| 26058 | 26060 |
| --- extsrc/shell.c | |
| +++ extsrc/shell.c | |
| @@ -15774,10 +15774,11 @@ | |
| 15774 | pCsr->iField = 0; |
| 15775 | pCsr->bOnePage = 0; |
| 15776 | sqlite3_free(pCsr->aPage); |
| 15777 | dbdataBufferFree(&pCsr->rec); |
| 15778 | pCsr->aPage = 0; |
| 15779 | } |
| 15780 | |
| 15781 | /* |
| 15782 | ** Close an sqlite_dbdata or sqlite_dbptr cursor. |
| 15783 | */ |
| @@ -16045,10 +16046,11 @@ | |
| 16045 | }else{ |
| 16046 | return SQLITE_OK; |
| 16047 | } |
| 16048 | }else{ |
| 16049 | /* If there is no record loaded, load it now. */ |
| 16050 | if( pCsr->nRec==0 ){ |
| 16051 | int bHasRowid = 0; |
| 16052 | int nPointer = 0; |
| 16053 | sqlite3_int64 nPayload = 0; |
| 16054 | sqlite3_int64 nHdr = 0; |
| @@ -26047,11 +26049,11 @@ | |
| 26047 | int iInterval; /* Reset iCnt to this value after each fault */ |
| 26048 | int eVerbose; /* When to print output */ |
| 26049 | int nHit; /* Number of hits seen so far */ |
| 26050 | int nRepeat; /* Turn off after this many hits. 0 for never */ |
| 26051 | int nSkip; /* Skip this many before first fault */ |
| 26052 | } faultsim_state = {-1, 0, 0, 0, 0, 0, 0}; |
| 26053 | |
| 26054 | /* |
| 26055 | ** This is the fault-sim callback |
| 26056 | */ |
| 26057 | static int faultsim_callback(int iArg){ |
| 26058 |
| --- extsrc/shell.c | |
| +++ extsrc/shell.c | |
| @@ -15774,10 +15774,11 @@ | |
| 15774 | pCsr->iField = 0; |
| 15775 | pCsr->bOnePage = 0; |
| 15776 | sqlite3_free(pCsr->aPage); |
| 15777 | dbdataBufferFree(&pCsr->rec); |
| 15778 | pCsr->aPage = 0; |
| 15779 | pCsr->nRec = 0; |
| 15780 | } |
| 15781 | |
| 15782 | /* |
| 15783 | ** Close an sqlite_dbdata or sqlite_dbptr cursor. |
| 15784 | */ |
| @@ -16045,10 +16046,11 @@ | |
| 16046 | }else{ |
| 16047 | return SQLITE_OK; |
| 16048 | } |
| 16049 | }else{ |
| 16050 | /* If there is no record loaded, load it now. */ |
| 16051 | assert( pCsr->rec.aBuf!=0 || pCsr->nRec==0 ); |
| 16052 | if( pCsr->nRec==0 ){ |
| 16053 | int bHasRowid = 0; |
| 16054 | int nPointer = 0; |
| 16055 | sqlite3_int64 nPayload = 0; |
| 16056 | sqlite3_int64 nHdr = 0; |
| @@ -26047,11 +26049,11 @@ | |
| 26049 | int iInterval; /* Reset iCnt to this value after each fault */ |
| 26050 | int eVerbose; /* When to print output */ |
| 26051 | int nHit; /* Number of hits seen so far */ |
| 26052 | int nRepeat; /* Turn off after this many hits. 0 for never */ |
| 26053 | int nSkip; /* Skip this many before first fault */ |
| 26054 | } faultsim_state = {-1, 0, 0, 0, 0, 0, 0, 0}; |
| 26055 | |
| 26056 | /* |
| 26057 | ** This is the fault-sim callback |
| 26058 | */ |
| 26059 | static int faultsim_callback(int iArg){ |
| 26060 |
+4
-4
| --- extsrc/sqlite3.c | ||
| +++ extsrc/sqlite3.c | ||
| @@ -16,11 +16,11 @@ | ||
| 16 | 16 | ** if you want a wrapper to interface SQLite with your choice of programming |
| 17 | 17 | ** language. The code for the "sqlite3" command-line shell is also in a |
| 18 | 18 | ** separate file. This file contains only code for the core SQLite library. |
| 19 | 19 | ** |
| 20 | 20 | ** The content in this amalgamation comes from Fossil check-in |
| 21 | -** de8182cf1773ac0d04268d896a613841cf6b. | |
| 21 | +** 96c92aba00c8375bc32fafcdf12429c58bd8. | |
| 22 | 22 | */ |
| 23 | 23 | #define SQLITE_CORE 1 |
| 24 | 24 | #define SQLITE_AMALGAMATION 1 |
| 25 | 25 | #ifndef SQLITE_PRIVATE |
| 26 | 26 | # define SQLITE_PRIVATE static |
| @@ -459,11 +459,11 @@ | ||
| 459 | 459 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 460 | 460 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 461 | 461 | */ |
| 462 | 462 | #define SQLITE_VERSION "3.46.0" |
| 463 | 463 | #define SQLITE_VERSION_NUMBER 3046000 |
| 464 | -#define SQLITE_SOURCE_ID "2024-05-21 11:11:29 de8182cf1773ac0d04268d896a613841cf6bf61f9f030342170657d5e06f2acb" | |
| 464 | +#define SQLITE_SOURCE_ID "2024-05-23 13:25:27 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e" | |
| 465 | 465 | |
| 466 | 466 | /* |
| 467 | 467 | ** CAPI3REF: Run-Time Library Version Numbers |
| 468 | 468 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 469 | 469 | ** |
| @@ -84739,11 +84739,11 @@ | ||
| 84739 | 84739 | u8 *a = (u8*)pRec; /* Typecast byte array */ |
| 84740 | 84740 | Mem *pMem = *ppVal; /* Write result into this Mem object */ |
| 84741 | 84741 | |
| 84742 | 84742 | assert( iCol>0 ); |
| 84743 | 84743 | iHdr = getVarint32(a, nHdr); |
| 84744 | - if( nHdr>nRec || iHdr>=nHdr ) return SQLITE_CORRUPT_BKPT; | |
| 84744 | + if( nHdr>(u32)nRec || iHdr>=nHdr ) return SQLITE_CORRUPT_BKPT; | |
| 84745 | 84745 | iField = nHdr; |
| 84746 | 84746 | for(i=0; i<=iCol; i++){ |
| 84747 | 84747 | iHdr += getVarint32(&a[iHdr], t); |
| 84748 | 84748 | testcase( iHdr==nHdr ); |
| 84749 | 84749 | testcase( iHdr==nHdr+1 ); |
| @@ -252537,11 +252537,11 @@ | ||
| 252537 | 252537 | int nArg, /* Number of args */ |
| 252538 | 252538 | sqlite3_value **apUnused /* Function arguments */ |
| 252539 | 252539 | ){ |
| 252540 | 252540 | assert( nArg==0 ); |
| 252541 | 252541 | UNUSED_PARAM2(nArg, apUnused); |
| 252542 | - sqlite3_result_text(pCtx, "fts5: 2024-05-20 17:52:35 08058d66d1bde4fcf8324482ee4c6c030c681383470d5076b6f75b74aac2ae29", -1, SQLITE_TRANSIENT); | |
| 252542 | + sqlite3_result_text(pCtx, "fts5: 2024-05-23 13:25:27 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e", -1, SQLITE_TRANSIENT); | |
| 252543 | 252543 | } |
| 252544 | 252544 | |
| 252545 | 252545 | /* |
| 252546 | 252546 | ** Return true if zName is the extension on one of the shadow tables used |
| 252547 | 252547 | ** by this module. |
| 252548 | 252548 |
| --- extsrc/sqlite3.c | |
| +++ extsrc/sqlite3.c | |
| @@ -16,11 +16,11 @@ | |
| 16 | ** if you want a wrapper to interface SQLite with your choice of programming |
| 17 | ** language. The code for the "sqlite3" command-line shell is also in a |
| 18 | ** separate file. This file contains only code for the core SQLite library. |
| 19 | ** |
| 20 | ** The content in this amalgamation comes from Fossil check-in |
| 21 | ** de8182cf1773ac0d04268d896a613841cf6b. |
| 22 | */ |
| 23 | #define SQLITE_CORE 1 |
| 24 | #define SQLITE_AMALGAMATION 1 |
| 25 | #ifndef SQLITE_PRIVATE |
| 26 | # define SQLITE_PRIVATE static |
| @@ -459,11 +459,11 @@ | |
| 459 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 460 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 461 | */ |
| 462 | #define SQLITE_VERSION "3.46.0" |
| 463 | #define SQLITE_VERSION_NUMBER 3046000 |
| 464 | #define SQLITE_SOURCE_ID "2024-05-21 11:11:29 de8182cf1773ac0d04268d896a613841cf6bf61f9f030342170657d5e06f2acb" |
| 465 | |
| 466 | /* |
| 467 | ** CAPI3REF: Run-Time Library Version Numbers |
| 468 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 469 | ** |
| @@ -84739,11 +84739,11 @@ | |
| 84739 | u8 *a = (u8*)pRec; /* Typecast byte array */ |
| 84740 | Mem *pMem = *ppVal; /* Write result into this Mem object */ |
| 84741 | |
| 84742 | assert( iCol>0 ); |
| 84743 | iHdr = getVarint32(a, nHdr); |
| 84744 | if( nHdr>nRec || iHdr>=nHdr ) return SQLITE_CORRUPT_BKPT; |
| 84745 | iField = nHdr; |
| 84746 | for(i=0; i<=iCol; i++){ |
| 84747 | iHdr += getVarint32(&a[iHdr], t); |
| 84748 | testcase( iHdr==nHdr ); |
| 84749 | testcase( iHdr==nHdr+1 ); |
| @@ -252537,11 +252537,11 @@ | |
| 252537 | int nArg, /* Number of args */ |
| 252538 | sqlite3_value **apUnused /* Function arguments */ |
| 252539 | ){ |
| 252540 | assert( nArg==0 ); |
| 252541 | UNUSED_PARAM2(nArg, apUnused); |
| 252542 | sqlite3_result_text(pCtx, "fts5: 2024-05-20 17:52:35 08058d66d1bde4fcf8324482ee4c6c030c681383470d5076b6f75b74aac2ae29", -1, SQLITE_TRANSIENT); |
| 252543 | } |
| 252544 | |
| 252545 | /* |
| 252546 | ** Return true if zName is the extension on one of the shadow tables used |
| 252547 | ** by this module. |
| 252548 |
| --- extsrc/sqlite3.c | |
| +++ extsrc/sqlite3.c | |
| @@ -16,11 +16,11 @@ | |
| 16 | ** if you want a wrapper to interface SQLite with your choice of programming |
| 17 | ** language. The code for the "sqlite3" command-line shell is also in a |
| 18 | ** separate file. This file contains only code for the core SQLite library. |
| 19 | ** |
| 20 | ** The content in this amalgamation comes from Fossil check-in |
| 21 | ** 96c92aba00c8375bc32fafcdf12429c58bd8. |
| 22 | */ |
| 23 | #define SQLITE_CORE 1 |
| 24 | #define SQLITE_AMALGAMATION 1 |
| 25 | #ifndef SQLITE_PRIVATE |
| 26 | # define SQLITE_PRIVATE static |
| @@ -459,11 +459,11 @@ | |
| 459 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 460 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 461 | */ |
| 462 | #define SQLITE_VERSION "3.46.0" |
| 463 | #define SQLITE_VERSION_NUMBER 3046000 |
| 464 | #define SQLITE_SOURCE_ID "2024-05-23 13:25:27 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e" |
| 465 | |
| 466 | /* |
| 467 | ** CAPI3REF: Run-Time Library Version Numbers |
| 468 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 469 | ** |
| @@ -84739,11 +84739,11 @@ | |
| 84739 | u8 *a = (u8*)pRec; /* Typecast byte array */ |
| 84740 | Mem *pMem = *ppVal; /* Write result into this Mem object */ |
| 84741 | |
| 84742 | assert( iCol>0 ); |
| 84743 | iHdr = getVarint32(a, nHdr); |
| 84744 | if( nHdr>(u32)nRec || iHdr>=nHdr ) return SQLITE_CORRUPT_BKPT; |
| 84745 | iField = nHdr; |
| 84746 | for(i=0; i<=iCol; i++){ |
| 84747 | iHdr += getVarint32(&a[iHdr], t); |
| 84748 | testcase( iHdr==nHdr ); |
| 84749 | testcase( iHdr==nHdr+1 ); |
| @@ -252537,11 +252537,11 @@ | |
| 252537 | int nArg, /* Number of args */ |
| 252538 | sqlite3_value **apUnused /* Function arguments */ |
| 252539 | ){ |
| 252540 | assert( nArg==0 ); |
| 252541 | UNUSED_PARAM2(nArg, apUnused); |
| 252542 | sqlite3_result_text(pCtx, "fts5: 2024-05-23 13:25:27 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e", -1, SQLITE_TRANSIENT); |
| 252543 | } |
| 252544 | |
| 252545 | /* |
| 252546 | ** Return true if zName is the extension on one of the shadow tables used |
| 252547 | ** by this module. |
| 252548 |
+1
-1
| --- extsrc/sqlite3.h | ||
| +++ extsrc/sqlite3.h | ||
| @@ -146,11 +146,11 @@ | ||
| 146 | 146 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 147 | 147 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 148 | 148 | */ |
| 149 | 149 | #define SQLITE_VERSION "3.46.0" |
| 150 | 150 | #define SQLITE_VERSION_NUMBER 3046000 |
| 151 | -#define SQLITE_SOURCE_ID "2024-05-21 11:11:29 de8182cf1773ac0d04268d896a613841cf6bf61f9f030342170657d5e06f2acb" | |
| 151 | +#define SQLITE_SOURCE_ID "2024-05-23 13:25:27 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e" | |
| 152 | 152 | |
| 153 | 153 | /* |
| 154 | 154 | ** CAPI3REF: Run-Time Library Version Numbers |
| 155 | 155 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 156 | 156 | ** |
| 157 | 157 |
| --- extsrc/sqlite3.h | |
| +++ extsrc/sqlite3.h | |
| @@ -146,11 +146,11 @@ | |
| 146 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 147 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 148 | */ |
| 149 | #define SQLITE_VERSION "3.46.0" |
| 150 | #define SQLITE_VERSION_NUMBER 3046000 |
| 151 | #define SQLITE_SOURCE_ID "2024-05-21 11:11:29 de8182cf1773ac0d04268d896a613841cf6bf61f9f030342170657d5e06f2acb" |
| 152 | |
| 153 | /* |
| 154 | ** CAPI3REF: Run-Time Library Version Numbers |
| 155 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 156 | ** |
| 157 |
| --- extsrc/sqlite3.h | |
| +++ extsrc/sqlite3.h | |
| @@ -146,11 +146,11 @@ | |
| 146 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 147 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 148 | */ |
| 149 | #define SQLITE_VERSION "3.46.0" |
| 150 | #define SQLITE_VERSION_NUMBER 3046000 |
| 151 | #define SQLITE_SOURCE_ID "2024-05-23 13:25:27 96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e" |
| 152 | |
| 153 | /* |
| 154 | ** CAPI3REF: Run-Time Library Version Numbers |
| 155 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 156 | ** |
| 157 |