diff options
| author | Scott MacVicar <scottmac@php.net> | 2011-06-14 17:00:49 +0000 |
|---|---|---|
| committer | Scott MacVicar <scottmac@php.net> | 2011-06-14 17:00:49 +0000 |
| commit | c2ca3525981289f17a4fd7a9e3d7e09a6b5881bb (patch) | |
| tree | 0e217b7217761ade023913be80af5789d389659f | |
| parent | d42a0aee916ac6342b70a0a497a4cf9d0e79cdfe (diff) | |
| download | php-git-c2ca3525981289f17a4fd7a9e3d7e09a6b5881bb.tar.gz | |
Upgrade SQLite to 3.7.6.3
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/sqlite3/libsqlite/sqlite3.c | 16 | ||||
| -rw-r--r-- | ext/sqlite3/libsqlite/sqlite3.h | 4 |
3 files changed, 16 insertions, 6 deletions
@@ -1,7 +1,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2011, PHP 5.3.7 -- Upgraded bundled SQLite to version 3.7.6.2. (Scott) +- Upgraded bundled SQLite to version 3.7.6.3. (Scott) - Upgraded bundled PCRE to version 8.12. (Scott) - Increased the backtrack limit from 100000 to 1000000 (Rasmus) diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c index fa37b0c2e4..d461dad4a4 100644 --- a/ext/sqlite3/libsqlite/sqlite3.c +++ b/ext/sqlite3/libsqlite/sqlite3.c @@ -4,7 +4,7 @@ /****************************************************************************** ** This file is an amalgamation of many separate C source files from SQLite -** version 3.7.6.2. By combining all the individual C code files into this +** version 3.7.6.3. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a single translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements @@ -654,9 +654,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.7.6.2" +#define SQLITE_VERSION "3.7.6.3" #define SQLITE_VERSION_NUMBER 3007006 -#define SQLITE_SOURCE_ID "2011-04-17 17:25:17 154ddbc17120be2915eb03edc52af1225eb7cb5e" +#define SQLITE_SOURCE_ID "2011-05-19 13:26:54 ed1da510a239ea767a01dc332b667119fa3c908e" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -42076,11 +42076,21 @@ SQLITE_PRIVATE int sqlite3PagerCommitPhaseOne( }else{ if( pagerUseWal(pPager) ){ PgHdr *pList = sqlite3PcacheDirtyList(pPager->pPCache); + PgHdr *pPageOne = 0; + if( pList==0 ){ + /* Must have at least one page for the WAL commit flag. + ** Ticket [2d1a5c67dfc2363e44f29d9bbd57f] 2011-05-18 */ + rc = sqlite3PagerGet(pPager, 1, &pPageOne); + pList = pPageOne; + pList->pDirty = 0; + } + assert( pList!=0 || rc!=SQLITE_OK ); if( pList ){ rc = pagerWalFrames(pPager, pList, pPager->dbSize, 1, (pPager->fullSync ? pPager->syncFlags : 0) ); } + sqlite3PagerUnref(pPageOne); if( rc==SQLITE_OK ){ sqlite3PcacheCleanAll(pPager->pPCache); } diff --git a/ext/sqlite3/libsqlite/sqlite3.h b/ext/sqlite3/libsqlite/sqlite3.h index 3b7eb94dda..85e916c5e5 100644 --- a/ext/sqlite3/libsqlite/sqlite3.h +++ b/ext/sqlite3/libsqlite/sqlite3.h @@ -107,9 +107,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.7.6.2" +#define SQLITE_VERSION "3.7.6.3" #define SQLITE_VERSION_NUMBER 3007006 -#define SQLITE_SOURCE_ID "2011-04-17 17:25:17 154ddbc17120be2915eb03edc52af1225eb7cb5e" +#define SQLITE_SOURCE_ID "2011-05-19 13:26:54 ed1da510a239ea767a01dc332b667119fa3c908e" /* ** CAPI3REF: Run-Time Library Version Numbers |