iliaa           Tue Nov 25 23:50:51 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src    NEWS 
    /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.389&r2=1.2027.2.547.2.965.2.390&diff_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/NEWS        Tue 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.10&r2=1.1.2.11&diff_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.10    Sat 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*1000000 + 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 writes a file a page
 ** at a time and provides a journal for rollback.
 **
-** @(#) $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 _PAGER_H_
@@ -8521,7 +8521,7 @@
 ** This header file defines the interface that the sqlite page cache
 ** subsystem. 
 **
-** @(#) $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 _PCACHE_H_
@@ -8689,7 +8689,7 @@
 ** This header file is #include-ed by sqliteInt.h and thus ends up
 ** being included by every source file.
 **
-** $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_OS_H_
 #define _SQLITE_OS_H_
@@ -8971,7 +8971,7 @@
 ** Source files should #include the sqliteInt.h file and let that file
 ** include this one indirectly.
 **
-** $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 $
 */
 
 
@@ -11071,7 +11071,7 @@
 **
 ** This file contains definitions of global variables and contants.
 **
-** $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 $
 */
 
 
@@ -11159,7 +11159,7 @@
 ** This module implements the sqlite3_status() interface and related
 ** functionality.
 **
-** $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 $
 */
 
 /*
@@ -11286,7 +11286,7 @@
 ** sqlite3RegisterDateTimeFunctions() found at the bottom of the file.
 ** All other code has file scope.
 **
-** $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 $
 **
 ** SQLite processes all times and dates as Julian Day numbers.  The
 ** dates and times are stored as the number of days since noon
@@ -12365,7 +12365,7 @@
 ** This file contains OS interface code that is common to all
 ** architectures.
 **
-** $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 $
 */
 #define _SQLITE_OS_C_ 1
 #undef _SQLITE_OS_C_
@@ -12642,7 +12642,7 @@
 **
 *************************************************************************
 **
-** $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 $
 */
 
 /*
@@ -12741,7 +12741,7 @@
 ** are merely placeholders.  Real drivers must be substituted using
 ** sqlite3_config() before SQLite will operate.
 **
-** $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 $
 */
 
 /*
@@ -12805,7 +12805,7 @@
 ** This file contains implementations of the low-level memory allocation
 ** routines specified in the sqlite3_mem_methods object.
 **
-** $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 $
 */
 
 /*
@@ -12954,7 +12954,7 @@
 ** This file contains implementations of the low-level memory allocation
 ** routines specified in the sqlite3_mem_methods object.
 **
-** $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 $
 */
 
 /*
@@ -13397,7 +13397,7 @@
 ** This version of the memory allocation subsystem is included
 ** in the build only if SQLITE_ENABLE_MEMSYS3 is defined.
 **
-** $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 $
 */
 
 /*
@@ -14087,7 +14087,7 @@
 ** This version of the memory allocation subsystem is included
 ** in the build only if SQLITE_ENABLE_MEMSYS5 is defined.
 **
-** $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 $
 */
 
 /*
@@ -14568,7 +14568,7 @@
 ** This file contains code that is common across all mutex implementations.
 
 **
-** $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_MUTEX_OMIT
@@ -14728,7 +14728,7 @@
 ** that does error checking on mutexes to make sure they are being
 ** called correctly.
 **
-** $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 $
 */
 
 
@@ -14902,7 +14902,7 @@
 *************************************************************************
 ** This file contains the C functions that implement mutexes for OS/2
 **
-** $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 $
 */
 
 /*
@@ -15177,7 +15177,7 @@
 *************************************************************************
 ** This file contains the C functions that implement mutexes for pthreads
 **
-** $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 $
 */
 
 /*
@@ -15504,7 +15504,7 @@
 *************************************************************************
 ** This file contains the C functions that implement mutexes for win32
 **
-** $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 $
 */
 
 /*
@@ -15758,7 +15758,7 @@
 **
 ** Memory allocation functions used throughout 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 $
 */
 
 /*
@@ -16540,7 +16540,7 @@
 ** an historical reference.  Most of the "enhancements" have been backed
 ** out so that the functionality is now the same as standard printf().
 **
-** $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 $
 **
 **************************************************************************
 **
@@ -17179,7 +17179,10 @@
         n += i + 1 + needQuote*2;
         if( n>etBUFSIZE ){
           bufpt = zExtra = sqlite3Malloc( n );
-          if( bufpt==0 ) return;
+          if( bufpt==0 ){
+            pAccum->mallocFailed = 1;
+            return;
+          }
         }else{
           bufpt = buf;
         }
@@ -17483,7 +17486,7 @@
 ** Random numbers are used by some of the database backends in order
 ** to generate random integer keys for tables or random filenames.
 **
-** $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 $
 */
 
 
@@ -17629,7 +17632,7 @@
 ** This file contains routines used to translate between UTF-8, 
 ** UTF-16, UTF-16BE, and UTF-16LE.
 **
-** $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 $
 **
 ** Notes on UTF-8:
 **
@@ -17671,7 +17674,7 @@
 ** 6000 lines long) it was split up into several smaller files and
 ** this header information was factored out.
 **
-** $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 _VDBEINT_H_
 #define _VDBEINT_H_
@@ -18592,7 +18595,7 @@
 ** This file contains functions for allocating memory, comparing
 ** strings, and stuff like that.
 **
-** $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 $
 */
 
 
@@ -19542,7 +19545,7 @@
 ** This is the implementation of generic hash-tables
 ** 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 $
 */
 
 /* Turn bulk memory into a hash table object by initializing the
@@ -20001,7 +20004,7 @@
 **
 ** This file contains code that is specific to OS/2.
 **
-** $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 $
 */
 
 
@@ -20064,7 +20067,7 @@
 ** This file should be #included by the os_*.c files only.  It is not a
 ** general purpose header file.
 **
-** $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 _OS_COMMON_H_
 #define _OS_COMMON_H_
@@ -20135,7 +20138,7 @@
 ** This file contains inline asm code for retrieving "high-performance"
 ** counters for x86 class CPUs.
 **
-** $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 _HWTIME_H_
 #define _HWTIME_H_
@@ -21356,7 +21359,7 @@
 **
 ** This file contains code that is specific to Unix systems.
 **
-** $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 $
 */
 #if SQLITE_OS_UNIX              /* This file is used on unix only */
 
@@ -21511,7 +21514,7 @@
 ** This file should be #included by the os_*.c files only.  It is not a
 ** general purpose header file.
 **
-** $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 _OS_COMMON_H_
 #define _OS_COMMON_H_
@@ -21582,7 +21585,7 @@
 ** This file contains inline asm code for retrieving "high-performance"
 ** counters for x86 class CPUs.
 **
-** $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 _HWTIME_H_
 #define _HWTIME_H_
@@ -25092,7 +25095,7 @@
 **
 ** This file contains code that is specific to windows.
 **
-** $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 $
 */
 #if SQLITE_OS_WIN               /* This file is used for windows only */
 
@@ -25160,7 +25163,7 @@
 ** This file should be #included by the os_*.c files only.  It is not a
 ** general purpose header file.
 **
-** $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 _OS_COMMON_H_
 #define _OS_COMMON_H_
@@ -25231,7 +25234,7 @@
 ** This file contains inline asm code for retrieving "high-performance"
 ** counters for x86 class CPUs.
 **
-** $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 _HWTIME_H_
 #define _HWTIME_H_
@@ -26863,6 +26866,11 @@
 */
 static int winRandomness(sqlite3_vfs *pVfs, int nBuf, char *zBuf){
   int n = 0;
+  UNUSED_PARAMETER(pVfs);
+#if defined(SQLITE_TEST)
+  n = nBuf;
+  memset(zBuf, 0, nBuf);
+#else
   if( sizeof(SYSTEMTIME)<=nBuf-n ){
     SYSTEMTIME x;
     GetSystemTime(&x);
@@ -26885,6 +26893,7 @@
     memcpy(&zBuf[n], &i, sizeof(i));
     n += sizeof(i);
   }
+#endif
   return n;
 }
 
@@ -27042,7 +27051,7 @@
 ** start of a transaction, and is thus usually less than a few thousand,
 ** but can be as large as 2 billion for a really big 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 $
 */
 
 /* Size of the Bitvec structure in bytes. */
@@ -27409,7 +27418,7 @@
 *************************************************************************
 ** This file implements that page cache.
 **
-** @(#) $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 $
 */
 
 /*
@@ -27997,7 +28006,7 @@
 ** If the default page cache implementation is overriden, then neither of
 ** these two features are available.
 **
-** @(#) $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 $
 */
 
 
@@ -28738,7 +28747,7 @@
 ** file simultaneously, or one process from reading the database while
 ** another is writing.
 **
-** @(#) $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_OMIT_DISKIO
 
@@ -32951,7 +32960,7 @@
 **
 *************************************************************************
 **
-** $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 $
 **
 ** This file contains code used to implement mutexes on Btree objects.
 ** This code really belongs in btree.c.  But btree.c is getting too
@@ -32971,7 +32980,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $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 $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** For a detailed discussion of BTrees, refer to
@@ -33904,7 +33913,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $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 $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -38198,9 +38207,12 @@
 end_allocate_page:
   releasePage(pTrunk);
   releasePage(pPrevTrunk);
-  if( rc==SQLITE_OK && sqlite3PagerPageRefcount((*ppPage)->pDbPage)>1 ){
-    releasePage(*ppPage);
-    return SQLITE_CORRUPT_BKPT;
+  if( rc==SQLITE_OK ){
+    if( sqlite3PagerPageRefcount((*ppPage)->pDbPage)>1 ){
+      releasePage(*ppPage);
+      return SQLITE_CORRUPT_BKPT;
+    }
+    (*ppPage)->isInit = 0;
   }
   return rc;
 }
@@ -41348,7 +41360,7 @@
 ** This file implements a FIFO queue of rowids used for processing
 ** UPDATE and DELETE statements.
 **
-** $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 $
 */
 
 /*
@@ -41482,7 +41494,7 @@
 ** only within the VDBE.  Interface routines refer to a Mem using the
 ** name sqlite_value
 **
-** $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 $
 */
 
 /*
@@ -42528,7 +42540,7 @@
 ** to version 2.8.7, all this code was combined into the vdbe.c source file.
 ** But that file was getting too big so this subroutines were split out.
 **
-** $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 $
 */
 
 
@@ -45011,7 +45023,7 @@
 ** This file contains code use to implement APIs that are part of the
 ** VDBE.
 **
-** $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 $
 */
 
 #if 0 && defined(SQLITE_ENABLE_MEMORY_MANAGEMENT)
@@ -46351,7 +46363,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $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 $
 */
 
 /*
@@ -46787,7 +46799,7 @@
 ** This file contains inline asm code for retrieving "high-performance"
 ** counters for x86 class CPUs.
 **
-** $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 _HWTIME_H_
 #define _HWTIME_H_
@@ -51551,7 +51563,7 @@
 **
 ** This file contains code used to implement incremental BLOB I/O.
 **
-** $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 $
 */
 
 
@@ -51898,7 +51910,7 @@
 **
 *************************************************************************
 **
-** @(#) $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 $
 */
 
 #ifdef SQLITE_ENABLE_ATOMIC_WRITE
@@ -52143,7 +52155,7 @@
 ** The in-memory rollback journal is used to journal transactions for
 ** ":memory:" databases and when the journal_mode=MEMORY pragma is used.
 **
-** @(#) $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 $
 */
 
 /* Forward references to internal structures */
@@ -52388,7 +52400,7 @@
 ** This file contains routines used for walking the parser tree for
 ** an SQL statement.
 **
-** $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 $
 */
 
 
@@ -52524,7 +52536,7 @@
 ** resolve all identifiers by associating them with a particular
 ** table and column.
 **
-** $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 $
 */
 
 /*
@@ -53691,7 +53703,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions 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 $
 */
 
 /*
@@ -56793,7 +56805,7 @@
 ** This file contains C code routines that used to generate VDBE code
 ** that implements the ALTER TABLE command.
 **
-** $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 $
 */
 
 /*
@@ -57417,7 +57429,7 @@
 *************************************************************************
 ** This file contains code associated with the ANALYZE command.
 **
-** @(#) $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_OMIT_ANALYZE
 
@@ -57846,7 +57858,7 @@
 *************************************************************************
 ** This file contains code used to implement the ATTACH and DETACH commands.
 **
-** $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_OMIT_ATTACH
@@ -58389,7 +58401,7 @@
 ** systems that do not need this facility may omit it by recompiling
 ** the library with -DSQLITE_OMIT_AUTHORIZATION=1
 **
-** $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 $
 */
 
 /*
@@ -58633,7 +58645,7 @@
 **     COMMIT
 **     ROLLBACK
 **
-** $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 $
 */
 
 /*
@@ -62205,7 +62217,7 @@
 ** This file contains functions used to access the internal hash tables
 ** of user defined functions and collation sequences.
 **
-** $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 $
 */
 
 
@@ -62657,7 +62669,7 @@
 ** This file contains C code routines that are called by the parser
 ** in order to generate code for DELETE FROM statements.
 **
-** $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 $
 */
 
 /*
@@ -63298,7 +63310,7 @@
 ** sqliteRegisterBuildinFunctions() found at the bottom of the file.
 ** All other code has file scope.
 **
-** $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 $
 */
 
 /*
@@ -64693,7 +64705,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle INSERT statements 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 $
 */
 
 /*
@@ -66433,7 +66445,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $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 $
 */
 
 
@@ -66578,7 +66590,7 @@
 ** This file contains code used to dynamically load extensions into
 ** the SQLite library.
 **
-** $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_CORE
@@ -66603,7 +66615,7 @@
 ** as extensions by SQLite should #include this file instead of 
 ** sqlite3.h.
 **
-** @(#) $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 _SQLITE3EXT_H_
 #define _SQLITE3EXT_H_
@@ -67564,7 +67576,7 @@
 *************************************************************************
 ** This file contains code used to implement the PRAGMA command.
 **
-** $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 $
 */
 
 /* Ignore this whole file if pragmas are disabled
@@ -68921,7 +68933,7 @@
 ** interface, and routines that contribute to loading the database schema
 ** from disk.
 **
-** $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 $
 */
 
 /*
@@ -69733,7 +69745,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle SELECT statements 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 $
 */
 
 
@@ -73920,7 +73932,7 @@
 ** These routines are in a separate files so that they will not be linked
 ** if they are not used.
 **
-** $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_OMIT_GET_TABLE
@@ -74115,7 +74127,7 @@
 *************************************************************************
 **
 **
-** $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_OMIT_TRIGGER
@@ -74970,7 +74982,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle UPDATE statements.
 **
-** $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_OMIT_VIRTUALTABLE
@@ -75655,7 +75667,7 @@
 ** Most of the code in this file may be omitted by defining the
 ** SQLITE_OMIT_VACUUM macro.
 **
-** $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 $
 */
 
 #if !defined(SQLITE_OMIT_VACUUM) && !defined(SQLITE_OMIT_ATTACH)
@@ -75953,7 +75965,7 @@
 *************************************************************************
 ** This file contains code used to help implement virtual tables.
 **
-** $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_OMIT_VIRTUALTABLE
 
@@ -76801,7 +76813,7 @@
 ** so is applicable.  Because this module is responsible for selecting
 ** indices, you might also think of this module as the "query optimizer".
 **
-** $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 $
 */
 
 /*
@@ -82921,7 +82933,7 @@
 ** individual tokens and sends those tokens one-by-one over to the
 ** parser for analysis.
 **
-** $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 $
 */
 
 /*
@@ -82974,7 +82986,7 @@
 **
 ** The code in this file has been automatically generated by
 **
-**     $Header: /repository/php-src/ext/sqlite3/libsqlite/sqlite3.c,v 1.1.2.10 
2008/11/22 13:41:21 pajoye Exp $
+**     $Header: /repository/php-src/ext/sqlite3/libsqlite/sqlite3.c,v 1.1.2.11 
2008/11/25 23:50:32 iliaa Exp $
 **
 ** The code in this file implements a function that determines whether
 ** or not a given identifier is really an SQL keyword.  The same thing
@@ -83554,7 +83566,7 @@
 ** separating it out, the code will be automatically omitted from
 ** static links that do not use it.
 **
-** $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_OMIT_COMPLETE
 
@@ -83831,7 +83843,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $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 $
 */
 
 #ifdef SQLITE_ENABLE_FTS3
@@ -95114,7 +95126,7 @@
 ** This file contains code for implementations of the r-tree and r*-tree
 ** algorithms packaged as an SQLite virtual table module.
 **
-** $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 $
 */
 
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_RTREE)
@@ -97968,7 +97980,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $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 $
 **
 ** This file implements an integration between the ICU library 
 ** ("International Components for Unicode", an open-source library 
@@ -98469,7 +98481,7 @@
 *************************************************************************
 ** This file implements a tokenizer for fts3 based on the ICU library.
 ** 
-** $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 $
 */
 
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.h?r1=1.1.2.7&r2=1.1.2.8&diff_format=u
Index: php-src/ext/sqlite3/libsqlite/sqlite3.h
diff -u php-src/ext/sqlite3/libsqlite/sqlite3.h:1.1.2.7 
php-src/ext/sqlite3/libsqlite/sqlite3.h:1.1.2.8
--- php-src/ext/sqlite3/libsqlite/sqlite3.h:1.1.2.7     Sat Nov 22 11:06:04 2008
+++ php-src/ext/sqlite3/libsqlite/sqlite3.h     Tue Nov 25 23:50:42 2008
@@ -30,7 +30,7 @@
 ** the version number) and changes its name to "sqlite3.h" as
 ** part of the build process.
 **
-** @(#) $Id: sqlite3.h,v 1.1.2.7 2008/11/22 11:06:04 scottmac Exp $
+** @(#) $Id: sqlite3.h,v 1.1.2.8 2008/11/25 23:50:42 iliaa Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -107,7 +107,7 @@
 **          with the value (X*1000000 + 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
 
 /*
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3ext.h?r1=1.1.2.6&r2=1.1.2.7&diff_format=u
Index: php-src/ext/sqlite3/libsqlite/sqlite3ext.h
diff -u php-src/ext/sqlite3/libsqlite/sqlite3ext.h:1.1.2.6 
php-src/ext/sqlite3/libsqlite/sqlite3ext.h:1.1.2.7
--- php-src/ext/sqlite3/libsqlite/sqlite3ext.h:1.1.2.6  Sat Nov 22 11:06:04 2008
+++ php-src/ext/sqlite3/libsqlite/sqlite3ext.h  Tue Nov 25 23:50:42 2008
@@ -15,7 +15,7 @@
 ** as extensions by SQLite should #include this file instead of 
 ** sqlite3.h.
 **
-** @(#) $Id: sqlite3ext.h,v 1.1.2.6 2008/11/22 11:06:04 scottmac Exp $
+** @(#) $Id: sqlite3ext.h,v 1.1.2.7 2008/11/25 23:50:42 iliaa Exp $
 */
 #ifndef _SQLITE3EXT_H_
 #define _SQLITE3EXT_H_

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to