Fossil SCM
Update the built-in SQLite to the 3.7.8 release.
Commit
8d4c5642777c3515038ab28d2a42cd94489f7052
Parent
b54b8e751a1d1df…
2 files changed
+2
-5
+1
-1
+2
-5
| --- src/sqlite3.c | ||
| +++ src/sqlite3.c | ||
| @@ -656,11 +656,11 @@ | ||
| 656 | 656 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 657 | 657 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 658 | 658 | */ |
| 659 | 659 | #define SQLITE_VERSION "3.7.8" |
| 660 | 660 | #define SQLITE_VERSION_NUMBER 3007008 |
| 661 | -#define SQLITE_SOURCE_ID "2011-09-17 17:29:20 b31a7d7db9040d8eedaf1ecd89ea0033f579d0f1" | |
| 661 | +#define SQLITE_SOURCE_ID "2011-09-19 14:49:19 3e0da808d2f5b4d12046e05980ca04578f581177" | |
| 662 | 662 | |
| 663 | 663 | /* |
| 664 | 664 | ** CAPI3REF: Run-Time Library Version Numbers |
| 665 | 665 | ** KEYWORDS: sqlite3_version, sqlite3_sourceid |
| 666 | 666 | ** |
| @@ -8647,11 +8647,10 @@ | ||
| 8647 | 8647 | ** NOTE: These values must match the corresponding BTREE_ values in btree.h. |
| 8648 | 8648 | */ |
| 8649 | 8649 | #define PAGER_OMIT_JOURNAL 0x0001 /* Do not use a rollback journal */ |
| 8650 | 8650 | #define PAGER_NO_READLOCK 0x0002 /* Omit readlocks on readonly files */ |
| 8651 | 8651 | #define PAGER_MEMORY 0x0004 /* In-memory database */ |
| 8652 | -#define PAGER_SORTER 0x0020 /* Accumulator in external merge sort */ | |
| 8653 | 8652 | |
| 8654 | 8653 | /* |
| 8655 | 8654 | ** Valid values for the second argument to sqlite3PagerLockingMode(). |
| 8656 | 8655 | */ |
| 8657 | 8656 | #define PAGER_LOCKINGMODE_QUERY -1 |
| @@ -12038,11 +12037,11 @@ | ||
| 12038 | 12037 | SQLITE_DEFAULT_MEMSTATUS, /* bMemstat */ |
| 12039 | 12038 | 1, /* bCoreMutex */ |
| 12040 | 12039 | SQLITE_THREADSAFE==1, /* bFullMutex */ |
| 12041 | 12040 | SQLITE_USE_URI, /* bOpenUri */ |
| 12042 | 12041 | 0x7ffffffe, /* mxStrlen */ |
| 12043 | - 100, /* szLookaside */ | |
| 12042 | + 128, /* szLookaside */ | |
| 12044 | 12043 | 500, /* nLookaside */ |
| 12045 | 12044 | {0,0,0,0,0,0,0,0}, /* m */ |
| 12046 | 12045 | {0,0,0,0,0,0,0,0,0}, /* mutex */ |
| 12047 | 12046 | {0,0,0,0,0,0,0,0,0,0,0}, /* pcache */ |
| 12048 | 12047 | (void*)0, /* pHeap */ |
| @@ -38151,11 +38150,10 @@ | ||
| 38151 | 38150 | u8 ckptSyncFlags; /* SYNC_NORMAL or SYNC_FULL for checkpoint */ |
| 38152 | 38151 | u8 syncFlags; /* SYNC_NORMAL or SYNC_FULL otherwise */ |
| 38153 | 38152 | u8 tempFile; /* zFilename is a temporary file */ |
| 38154 | 38153 | u8 readOnly; /* True for a read-only database */ |
| 38155 | 38154 | u8 memDb; /* True to inhibit all file I/O */ |
| 38156 | - u8 hasSeenStress; /* pagerStress() called one or more times */ | |
| 38157 | 38155 | |
| 38158 | 38156 | /************************************************************************** |
| 38159 | 38157 | ** The following block contains those class members that change during |
| 38160 | 38158 | ** routine opertion. Class members not in this block are either fixed |
| 38161 | 38159 | ** when the pager is first created or else only change when there is a |
| @@ -41706,11 +41704,10 @@ | ||
| 41706 | 41704 | ** is impossible for sqlite3PCacheFetch() to be called with createFlag==1 |
| 41707 | 41705 | ** while in the error state, hence it is impossible for this routine to |
| 41708 | 41706 | ** be called in the error state. Nevertheless, we include a NEVER() |
| 41709 | 41707 | ** test for the error state as a safeguard against future changes. |
| 41710 | 41708 | */ |
| 41711 | - pPager->hasSeenStress = 1; | |
| 41712 | 41709 | if( NEVER(pPager->errCode) ) return SQLITE_OK; |
| 41713 | 41710 | if( pPager->doNotSpill ) return SQLITE_OK; |
| 41714 | 41711 | if( pPager->doNotSyncSpill && (pPg->flags & PGHDR_NEED_SYNC)!=0 ){ |
| 41715 | 41712 | return SQLITE_OK; |
| 41716 | 41713 | } |
| 41717 | 41714 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -656,11 +656,11 @@ | |
| 656 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 657 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 658 | */ |
| 659 | #define SQLITE_VERSION "3.7.8" |
| 660 | #define SQLITE_VERSION_NUMBER 3007008 |
| 661 | #define SQLITE_SOURCE_ID "2011-09-17 17:29:20 b31a7d7db9040d8eedaf1ecd89ea0033f579d0f1" |
| 662 | |
| 663 | /* |
| 664 | ** CAPI3REF: Run-Time Library Version Numbers |
| 665 | ** KEYWORDS: sqlite3_version, sqlite3_sourceid |
| 666 | ** |
| @@ -8647,11 +8647,10 @@ | |
| 8647 | ** NOTE: These values must match the corresponding BTREE_ values in btree.h. |
| 8648 | */ |
| 8649 | #define PAGER_OMIT_JOURNAL 0x0001 /* Do not use a rollback journal */ |
| 8650 | #define PAGER_NO_READLOCK 0x0002 /* Omit readlocks on readonly files */ |
| 8651 | #define PAGER_MEMORY 0x0004 /* In-memory database */ |
| 8652 | #define PAGER_SORTER 0x0020 /* Accumulator in external merge sort */ |
| 8653 | |
| 8654 | /* |
| 8655 | ** Valid values for the second argument to sqlite3PagerLockingMode(). |
| 8656 | */ |
| 8657 | #define PAGER_LOCKINGMODE_QUERY -1 |
| @@ -12038,11 +12037,11 @@ | |
| 12038 | SQLITE_DEFAULT_MEMSTATUS, /* bMemstat */ |
| 12039 | 1, /* bCoreMutex */ |
| 12040 | SQLITE_THREADSAFE==1, /* bFullMutex */ |
| 12041 | SQLITE_USE_URI, /* bOpenUri */ |
| 12042 | 0x7ffffffe, /* mxStrlen */ |
| 12043 | 100, /* szLookaside */ |
| 12044 | 500, /* nLookaside */ |
| 12045 | {0,0,0,0,0,0,0,0}, /* m */ |
| 12046 | {0,0,0,0,0,0,0,0,0}, /* mutex */ |
| 12047 | {0,0,0,0,0,0,0,0,0,0,0}, /* pcache */ |
| 12048 | (void*)0, /* pHeap */ |
| @@ -38151,11 +38150,10 @@ | |
| 38151 | u8 ckptSyncFlags; /* SYNC_NORMAL or SYNC_FULL for checkpoint */ |
| 38152 | u8 syncFlags; /* SYNC_NORMAL or SYNC_FULL otherwise */ |
| 38153 | u8 tempFile; /* zFilename is a temporary file */ |
| 38154 | u8 readOnly; /* True for a read-only database */ |
| 38155 | u8 memDb; /* True to inhibit all file I/O */ |
| 38156 | u8 hasSeenStress; /* pagerStress() called one or more times */ |
| 38157 | |
| 38158 | /************************************************************************** |
| 38159 | ** The following block contains those class members that change during |
| 38160 | ** routine opertion. Class members not in this block are either fixed |
| 38161 | ** when the pager is first created or else only change when there is a |
| @@ -41706,11 +41704,10 @@ | |
| 41706 | ** is impossible for sqlite3PCacheFetch() to be called with createFlag==1 |
| 41707 | ** while in the error state, hence it is impossible for this routine to |
| 41708 | ** be called in the error state. Nevertheless, we include a NEVER() |
| 41709 | ** test for the error state as a safeguard against future changes. |
| 41710 | */ |
| 41711 | pPager->hasSeenStress = 1; |
| 41712 | if( NEVER(pPager->errCode) ) return SQLITE_OK; |
| 41713 | if( pPager->doNotSpill ) return SQLITE_OK; |
| 41714 | if( pPager->doNotSyncSpill && (pPg->flags & PGHDR_NEED_SYNC)!=0 ){ |
| 41715 | return SQLITE_OK; |
| 41716 | } |
| 41717 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -656,11 +656,11 @@ | |
| 656 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 657 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 658 | */ |
| 659 | #define SQLITE_VERSION "3.7.8" |
| 660 | #define SQLITE_VERSION_NUMBER 3007008 |
| 661 | #define SQLITE_SOURCE_ID "2011-09-19 14:49:19 3e0da808d2f5b4d12046e05980ca04578f581177" |
| 662 | |
| 663 | /* |
| 664 | ** CAPI3REF: Run-Time Library Version Numbers |
| 665 | ** KEYWORDS: sqlite3_version, sqlite3_sourceid |
| 666 | ** |
| @@ -8647,11 +8647,10 @@ | |
| 8647 | ** NOTE: These values must match the corresponding BTREE_ values in btree.h. |
| 8648 | */ |
| 8649 | #define PAGER_OMIT_JOURNAL 0x0001 /* Do not use a rollback journal */ |
| 8650 | #define PAGER_NO_READLOCK 0x0002 /* Omit readlocks on readonly files */ |
| 8651 | #define PAGER_MEMORY 0x0004 /* In-memory database */ |
| 8652 | |
| 8653 | /* |
| 8654 | ** Valid values for the second argument to sqlite3PagerLockingMode(). |
| 8655 | */ |
| 8656 | #define PAGER_LOCKINGMODE_QUERY -1 |
| @@ -12038,11 +12037,11 @@ | |
| 12037 | SQLITE_DEFAULT_MEMSTATUS, /* bMemstat */ |
| 12038 | 1, /* bCoreMutex */ |
| 12039 | SQLITE_THREADSAFE==1, /* bFullMutex */ |
| 12040 | SQLITE_USE_URI, /* bOpenUri */ |
| 12041 | 0x7ffffffe, /* mxStrlen */ |
| 12042 | 128, /* szLookaside */ |
| 12043 | 500, /* nLookaside */ |
| 12044 | {0,0,0,0,0,0,0,0}, /* m */ |
| 12045 | {0,0,0,0,0,0,0,0,0}, /* mutex */ |
| 12046 | {0,0,0,0,0,0,0,0,0,0,0}, /* pcache */ |
| 12047 | (void*)0, /* pHeap */ |
| @@ -38151,11 +38150,10 @@ | |
| 38150 | u8 ckptSyncFlags; /* SYNC_NORMAL or SYNC_FULL for checkpoint */ |
| 38151 | u8 syncFlags; /* SYNC_NORMAL or SYNC_FULL otherwise */ |
| 38152 | u8 tempFile; /* zFilename is a temporary file */ |
| 38153 | u8 readOnly; /* True for a read-only database */ |
| 38154 | u8 memDb; /* True to inhibit all file I/O */ |
| 38155 | |
| 38156 | /************************************************************************** |
| 38157 | ** The following block contains those class members that change during |
| 38158 | ** routine opertion. Class members not in this block are either fixed |
| 38159 | ** when the pager is first created or else only change when there is a |
| @@ -41706,11 +41704,10 @@ | |
| 41704 | ** is impossible for sqlite3PCacheFetch() to be called with createFlag==1 |
| 41705 | ** while in the error state, hence it is impossible for this routine to |
| 41706 | ** be called in the error state. Nevertheless, we include a NEVER() |
| 41707 | ** test for the error state as a safeguard against future changes. |
| 41708 | */ |
| 41709 | if( NEVER(pPager->errCode) ) return SQLITE_OK; |
| 41710 | if( pPager->doNotSpill ) return SQLITE_OK; |
| 41711 | if( pPager->doNotSyncSpill && (pPg->flags & PGHDR_NEED_SYNC)!=0 ){ |
| 41712 | return SQLITE_OK; |
| 41713 | } |
| 41714 |
+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.7.8" |
| 111 | 111 | #define SQLITE_VERSION_NUMBER 3007008 |
| 112 | -#define SQLITE_SOURCE_ID "2011-09-17 17:29:20 b31a7d7db9040d8eedaf1ecd89ea0033f579d0f1" | |
| 112 | +#define SQLITE_SOURCE_ID "2011-09-19 14:49:19 3e0da808d2f5b4d12046e05980ca04578f581177" | |
| 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.7.8" |
| 111 | #define SQLITE_VERSION_NUMBER 3007008 |
| 112 | #define SQLITE_SOURCE_ID "2011-09-17 17:29:20 b31a7d7db9040d8eedaf1ecd89ea0033f579d0f1" |
| 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.7.8" |
| 111 | #define SQLITE_VERSION_NUMBER 3007008 |
| 112 | #define SQLITE_SOURCE_ID "2011-09-19 14:49:19 3e0da808d2f5b4d12046e05980ca04578f581177" |
| 113 | |
| 114 | /* |
| 115 | ** CAPI3REF: Run-Time Library Version Numbers |
| 116 | ** KEYWORDS: sqlite3_version, sqlite3_sourceid |
| 117 | ** |
| 118 |