scottmac Tue, 14 Jun 2011 17:00:49 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=312159
Log:
Upgrade SQLite to 3.7.6.3
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.c
U php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.h
U php/php-src/branches/PHP_5_4/ext/sqlite3/libsqlite/sqlite3.c
U php/php-src/branches/PHP_5_4/ext/sqlite3/libsqlite/sqlite3.h
U php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.c
U php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.h
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2011-06-14 16:29:46 UTC (rev 312158)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-06-14 17:00:49 UTC (rev 312159)
@@ -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)
Modified: php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.c 2011-06-14 16:29:46 UTC (rev 312158)
+++ php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.c 2011-06-14 17:00:49 UTC (rev 312159)
@@ -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 @@
** [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 @@
}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);
}
Modified: php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.h 2011-06-14 16:29:46 UTC (rev 312158)
+++ php/php-src/branches/PHP_5_3/ext/sqlite3/libsqlite/sqlite3.h 2011-06-14 17:00:49 UTC (rev 312159)
@@ -107,9 +107,9 @@
** [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
Modified: php/php-src/branches/PHP_5_4/ext/sqlite3/libsqlite/sqlite3.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/sqlite3/libsqlite/sqlite3.c 2011-06-14 16:29:46 UTC (rev 312158)
+++ php/php-src/branches/PHP_5_4/ext/sqlite3/libsqlite/sqlite3.c 2011-06-14 17:00:49 UTC (rev 312159)
@@ -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 @@
** [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 @@
}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);
}
Modified: php/php-src/branches/PHP_5_4/ext/sqlite3/libsqlite/sqlite3.h
===================================================================
--- php/php-src/branches/PHP_5_4/ext/sqlite3/libsqlite/sqlite3.h 2011-06-14 16:29:46 UTC (rev 312158)
+++ php/php-src/branches/PHP_5_4/ext/sqlite3/libsqlite/sqlite3.h 2011-06-14 17:00:49 UTC (rev 312159)
@@ -107,9 +107,9 @@
** [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
Modified: php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.c
===================================================================
--- php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.c 2011-06-14 16:29:46 UTC (rev 312158)
+++ php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.c 2011-06-14 17:00:49 UTC (rev 312159)
@@ -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 @@
** [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 @@
}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);
}
Modified: php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.h
===================================================================
--- php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.h 2011-06-14 16:29:46 UTC (rev 312158)
+++ php/php-src/trunk/ext/sqlite3/libsqlite/sqlite3.h 2011-06-14 17:00:49 UTC (rev 312159)
@@ -107,9 +107,9 @@
** [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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
