[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h
iliaa Tue May 19 18:33:02 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS /php-src/ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h Log: Upgraded to 3.6.14.1 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.607r2=1.2027.2.547.2.965.2.608diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.607 php-src/NEWS:1.2027.2.547.2.965.2.608 --- php-src/NEWS:1.2027.2.547.2.965.2.607 Tue May 19 09:41:34 2009 +++ php-src/NEWSTue May 19 18:32:25 2009 @@ -1,7 +1,7 @@ PHPNEWS ||| ?? ??? 2009, PHP 5.3.0 RC 3 -- Upgraded bundled sqlite to version 3.6.14. (Scott) +- Upgraded bundled sqlite to version 3.6.14.1. (Ilia) - Upgraded bundled libmagic to 5.03 in the fileinfo extension. (Scott) - Removed all zend_extension_* php.ini directives. Zend extensions are now http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.c?r1=1.1.2.21r2=1.1.2.22diff_format=u Index: php-src/ext/sqlite3/libsqlite/sqlite3.c diff -u php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.21 php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.22 --- php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.21Thu May 7 12:39:26 2009 +++ php-src/ext/sqlite3/libsqlite/sqlite3.c Tue May 19 18:32:25 2009 @@ -4,7 +4,7 @@ /** ** This file is an amalgamation of many separate C source files from SQLite -** version 3.6.14. By combining all the individual C code files into this +** version 3.6.14.1. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a one translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements @@ -21,7 +21,7 @@ ** is also in a separate file. This file contains only code for the core ** SQLite library. ** -** This amalgamation was generated on 2009-05-07 01:56:00 UTC. +** This amalgamation was generated on 2009-05-18 18:33:54 UTC. */ #define SQLITE_CORE 1 #define SQLITE_AMALGAMATION 1 @@ -45,7 +45,7 @@ * ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.22 2009/05/19 18:32:25 iliaa Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -74,7 +74,7 @@ ** ** This file defines various limits of what SQLite can process. ** -** @(#) $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.22 2009/05/19 18:32:25 iliaa Exp $ */ /* @@ -532,7 +532,7 @@ ** the version number) and changes its name to sqlite3.h as ** part of the build process. ** -** @(#) $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.22 2009/05/19 18:32:25 iliaa Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ @@ -601,7 +601,7 @@ ** ** Requirements: [H10011] [H10014] */ -#define SQLITE_VERSION 3.6.14 +#define SQLITE_VERSION 3.6.14.1 #define SQLITE_VERSION_NUMBER 3006014 /* @@ -6052,7 +6052,7 @@ ** This is the header file for the generic hash-table implemenation ** used in SQLite. ** -** $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ +** $Id: sqlite3.c,v 1.1.2.22 2009/05/19 18:32:25 iliaa Exp $ */ #ifndef _SQLITE_HASH_H_ #define _SQLITE_HASH_H_ @@ -6635,7 +6635,7 @@ ** subsystem. See comments in the source code for a detailed description ** of what each interface routine does. ** -** @(#) $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.22 2009/05/19 18:32:25 iliaa Exp $ */ #ifndef _BTREE_H_ #define _BTREE_H_ @@ -6867,7 +6867,7 @@ ** or VDBE. The VDBE implements an abstract machine that runs a ** simple program to access and modify the underlying database. ** -** $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ +** $Id: sqlite3.c,v 1.1.2.22 2009/05/19 18:32:25 iliaa Exp $ */ #ifndef _SQLITE_VDBE_H_ #define _SQLITE_VDBE_H_ @@ -7259,7 +7259,7 @@ ** subsystem. The page cache subsystem reads and writes a file a page ** at a time and provides a journal for rollback. ** -** @(#) $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.22 2009/05/19 18:32:25 iliaa Exp $ */ #ifndef _PAGER_H_ @@ -7427,7 +7427,7 @@ ** This header file defines the interface that the sqlite page cache ** subsystem. ** -** @(#) $Id: sqlite3.c,v 1.1.2.21 2009/05/07 12:39:26 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.22 2009/05/19 18:32:25 iliaa Exp $ */ #ifndef _PCACHE_H_ @@ -7595,7 +7595,7 @@ ** This header file is #include-ed by sqliteInt.h and thus ends up ** being included by
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h
iliaa Sun Jan 18 18:02:04 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcNEWS
/php-src/ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h
Log:
Upgraded bundled sqlite3 to 3.6.10
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.462r2=1.2027.2.547.2.965.2.463diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.462
php-src/NEWS:1.2027.2.547.2.965.2.463
--- php-src/NEWS:1.2027.2.547.2.965.2.462 Sat Jan 17 02:09:53 2009
+++ php-src/NEWSSun Jan 18 18:01:37 2009
@@ -1,7 +1,7 @@
PHPNEWS
|||
?? ??? 2009, PHP 5.3.0 Alpha 4
-- Upgraded bundled sqlite to version 3.6.8. (Scott, Ilia)
+- Upgraded bundled sqlite to version 3.6.10. (Scott, Ilia)
- Deprecated session_register(), session_unregister() and
session_is_registered(). (Hannes)
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.c?r1=1.1.2.15r2=1.1.2.16diff_format=u
Index: php-src/ext/sqlite3/libsqlite/sqlite3.c
diff -u php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.15
php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.16
--- php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.15Mon Jan 12 18:55:20 2009
+++ php-src/ext/sqlite3/libsqlite/sqlite3.c Sun Jan 18 18:01:38 2009
@@ -4,7 +4,7 @@
/**
** This file is an amalgamation of many separate C source files from SQLite
-** version 3.6.8. By combining all the individual C code files into this
+** version 3.6.10. By combining all the individual C code files into this
** single large file, the entire code can be compiled as a one translation
** unit. This allows many compilers to do optimizations that would not be
** possible if the files were compiled separately. Performance improvements
@@ -21,7 +21,7 @@
** is also in a separate file. This file contains only code for the core
** SQLite library.
**
-** This amalgamation was generated on 2009-01-12 15:45:58 UTC.
+** This amalgamation was generated on 2009-01-15 16:03:22 UTC.
*/
#define SQLITE_CORE 1
#define SQLITE_AMALGAMATION 1
@@ -45,7 +45,7 @@
*
** Internal interface definitions for SQLite.
**
-** @(#) $Id: sqlite3.c,v 1.1.2.15 2009/01/12 18:55:20 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.16 2009/01/18 18:01:38 iliaa Exp $
*/
#ifndef _SQLITEINT_H_
#define _SQLITEINT_H_
@@ -74,7 +74,7 @@
**
** This file defines various limits of what SQLite can process.
**
-** @(#) $Id: sqlite3.c,v 1.1.2.15 2009/01/12 18:55:20 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.16 2009/01/18 18:01:38 iliaa Exp $
*/
/*
@@ -424,16 +424,22 @@
** where multiple cases go to the same block of code, testcase()
** can insure that all cases are evaluated.
**
-** The TESTONLY macro is used to enclose variable declarations or
-** other bits of code that are needed to support the arguments
-** within testcase() macros.
*/
#ifdef SQLITE_COVERAGE_TEST
SQLITE_PRIVATE void sqlite3Coverage(int);
# define testcase(X) if( X ){ sqlite3Coverage(__LINE__); }
-# define TESTONLY(X) X
#else
# define testcase(X)
+#endif
+
+/*
+** The TESTONLY macro is used to enclose variable declarations or
+** other bits of code that are needed to support the arguments
+** within testcase() and assert() macros.
+*/
+#if !defined(NDEBUG) || defined(SQLITE_COVERAGE_TEST)
+# define TESTONLY(X) X
+#else
# define TESTONLY(X)
#endif
@@ -526,7 +532,7 @@
** the version number) and changes its name to sqlite3.h as
** part of the build process.
**
-** @(#) $Id: sqlite3.c,v 1.1.2.15 2009/01/12 18:55:20 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.16 2009/01/18 18:01:38 iliaa Exp $
*/
#ifndef _SQLITE3_H_
#define _SQLITE3_H_
@@ -603,8 +609,8 @@
** with the value (X*100 + Y*1000 + Z) where X, Y, and Z
** are the major version, minor version, and release number.
*/
-#define SQLITE_VERSION 3.6.8
-#define SQLITE_VERSION_NUMBER 3006008
+#define SQLITE_VERSION 3.6.10
+#define SQLITE_VERSION_NUMBER 3006010
/*
** CAPI3REF: Run-Time Library Version Numbers {H10020} S60100
@@ -7249,7 +7255,7 @@
** This is the header file for the generic hash-table implemenation
** used in SQLite.
**
-** $Id: sqlite3.c,v 1.1.2.15 2009/01/12 18:55:20 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.16 2009/01/18 18:01:38 iliaa Exp $
*/
#ifndef _SQLITE_HASH_H_
#define _SQLITE_HASH_H_
@@ -7805,7 +7811,7 @@
** subsystem. See comments in the source code for a detailed description
** of what each interface routine does.
**
-** @(#) $Id: sqlite3.c,v 1.1.2.15 2009/01/12 18:55:20 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.16 2009/01/18 18:01:38 iliaa Exp $
*/
#ifndef _BTREE_H_
#define _BTREE_H_
@@ -8037,7 +8043,7 @@
** or VDBE.
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h
iliaa Tue Nov 25 23:50:51 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS /php-src/ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h Log: Upgraded bundled sqlite to version 3.6.6.1 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.389r2=1.2027.2.547.2.965.2.390diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.389 php-src/NEWS:1.2027.2.547.2.965.2.390 --- php-src/NEWS:1.2027.2.547.2.965.2.389 Tue Nov 25 09:56:31 2008 +++ php-src/NEWSTue Nov 25 23:50:31 2008 @@ -2,7 +2,7 @@ ||| ?? ??? 200?, PHP 5.3.0 Alpha 3 - Upgraded bundled PCRE to version 7.8. (Nuno) -- Upgraded bundled sqlite to version 3.6.2. (Scott) +- Upgraded bundled sqlite to version 3.6.6.1. (Scott, Ilia) - Moved ext/msql to PECL. (Derick, Lukas) http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.c?r1=1.1.2.10r2=1.1.2.11diff_format=u Index: php-src/ext/sqlite3/libsqlite/sqlite3.c diff -u php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.10 php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.11 --- php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.10Sat Nov 22 13:41:21 2008 +++ php-src/ext/sqlite3/libsqlite/sqlite3.c Tue Nov 25 23:50:32 2008 @@ -4,7 +4,7 @@ /** ** This file is an amalgamation of many separate C source files from SQLite -** version 3.6.6. By combining all the individual C code files into this +** version 3.6.6.1. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a one translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements @@ -21,7 +21,7 @@ ** is also in a separate file. This file contains only code for the core ** SQLite library. ** -** This amalgamation was generated on 2008-11-19 21:08:14 UTC. +** This amalgamation was generated on 2008-11-22 14:31:32 UTC. */ #define SQLITE_CORE 1 #define SQLITE_AMALGAMATION 1 @@ -45,7 +45,7 @@ * ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.11 2008/11/25 23:50:32 iliaa Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -74,7 +74,7 @@ ** ** This file defines various limits of what SQLite can process. ** -** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.11 2008/11/25 23:50:32 iliaa Exp $ */ /* @@ -401,7 +401,7 @@ ** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as ** the default. */ -#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+ defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+defined(SQLITE_POW2_MEMORY_SIZE)1 +#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+defined(SQLITE_POW2_MEMORY_SIZE)1 # error At most one of the following compile-time configuration options\ is allows: SQLITE_SYSTEM_MALLOC, SQLITE_MEMDEBUG, SQLITE_MEMORY_SIZE,\ SQLITE_MMAP_HEAP_SIZE, SQLITE_POW2_MEMORY_SIZE @@ -487,7 +487,7 @@ ** the version number) and changes its name to sqlite3.h as ** part of the build process. ** -** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.11 2008/11/25 23:50:32 iliaa Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ @@ -564,7 +564,7 @@ ** with the value (X*100 + Y*1000 + Z) where X, Y, and Z ** are the major version, minor version, and release number. */ -#define SQLITE_VERSION 3.6.6 +#define SQLITE_VERSION 3.6.6.1 #define SQLITE_VERSION_NUMBER 3006006 /* @@ -7202,7 +7202,7 @@ ** This is the header file for the generic hash-table implemenation ** used in SQLite. ** -** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $ +** $Id: sqlite3.c,v 1.1.2.11 2008/11/25 23:50:32 iliaa Exp $ */ #ifndef _SQLITE_HASH_H_ #define _SQLITE_HASH_H_ @@ -7753,7 +7753,7 @@ ** subsystem. See comments in the source code for a detailed description ** of what each interface routine does. ** -** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.11 2008/11/25 23:50:32 iliaa Exp $ */ #ifndef _BTREE_H_ #define _BTREE_H_ @@ -7984,7 +7984,7 @@ ** or VDBE. The VDBE implements an abstract machine that runs a ** simple program to access and modify the underlying database. ** -** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $ +** $Id: sqlite3.c,v 1.1.2.11 2008/11/25 23:50:32 iliaa Exp $ */ #ifndef _SQLITE_VDBE_H_ #define _SQLITE_VDBE_H_ @@ -8375,7 +8375,7 @@ ** subsystem. The page cache subsystem reads and
