scottmac Thu Nov 27 08:41:31 2008 UTC
Modified files:
/php-src/ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h
Log:
Update libsqlite to 3.6.6.2
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.c?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/sqlite3/libsqlite/sqlite3.c
diff -u php-src/ext/sqlite3/libsqlite/sqlite3.c:1.12
php-src/ext/sqlite3/libsqlite/sqlite3.c:1.13
--- php-src/ext/sqlite3/libsqlite/sqlite3.c:1.12 Tue Nov 25 23:53:33 2008
+++ php-src/ext/sqlite3/libsqlite/sqlite3.c Thu Nov 27 08:40:50 2008
@@ -4,7 +4,7 @@
/******************************************************************************
** This file is an amalgamation of many separate C source files from SQLite
-** version 3.6.6.1. By combining all the individual C code files into this
+** version 3.6.6.2. 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-22 14:31:32 UTC.
+** This amalgamation was generated on 2008-11-26 17:54:40 UTC.
*/
#define SQLITE_CORE 1
#define SQLITE_AMALGAMATION 1
@@ -45,7 +45,7 @@
*************************************************************************
** Internal interface definitions for SQLite.
**
-** @(#) $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac 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.12 2008/11/25 23:53:33 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -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.12 2008/11/25 23:53:33 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac 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.1"
+#define SQLITE_VERSION "3.6.6.2"
#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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac 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.12 2008/11/25 23:53:33 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac 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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac 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.12 2008/11/25 23:53:33 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac 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.12 2008/11/25 23:53:33 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac 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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac 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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
@@ -11071,7 +11071,7 @@
**
** This file contains definitions of global variables and contants.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
@@ -11159,7 +11159,7 @@
** This module implements the sqlite3_status() interface and related
** functionality.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -11286,7 +11286,7 @@
** sqlite3RegisterDateTimeFunctions() found at the bottom of the file.
** All other code has file scope.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac 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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#define _SQLITE_OS_C_ 1
#undef _SQLITE_OS_C_
@@ -12642,7 +12642,7 @@
**
*************************************************************************
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac 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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac 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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac 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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac 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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac 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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -14568,7 +14568,7 @@
** This file contains code that is common across all mutex implementations.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac 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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
@@ -14902,7 +14902,7 @@
*************************************************************************
** This file contains the C functions that implement mutexes for OS/2
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -15177,7 +15177,7 @@
*************************************************************************
** This file contains the C functions that implement mutexes for pthreads
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -15504,7 +15504,7 @@
*************************************************************************
** This file contains the C functions that implement mutexes for win32
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -15758,7 +15758,7 @@
**
** Memory allocation functions used throughout sqlite.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac 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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
**
**************************************************************************
**
@@ -17486,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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
@@ -17632,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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
**
** Notes on UTF-8:
**
@@ -17674,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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifndef _VDBEINT_H_
#define _VDBEINT_H_
@@ -18595,7 +18595,7 @@
** This file contains functions for allocating memory, comparing
** strings, and stuff like that.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
@@ -19545,7 +19545,7 @@
** This is the implementation of generic hash-tables
** used in SQLite.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/* Turn bulk memory into a hash table object by initializing the
@@ -20004,7 +20004,7 @@
**
** This file contains code that is specific to OS/2.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
@@ -20067,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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifndef _OS_COMMON_H_
#define _OS_COMMON_H_
@@ -20138,7 +20138,7 @@
** This file contains inline asm code for retrieving "high-performance"
** counters for x86 class CPUs.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifndef _HWTIME_H_
#define _HWTIME_H_
@@ -21359,7 +21359,7 @@
**
** This file contains code that is specific to Unix systems.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#if SQLITE_OS_UNIX /* This file is used on unix only */
@@ -21514,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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifndef _OS_COMMON_H_
#define _OS_COMMON_H_
@@ -21585,7 +21585,7 @@
** This file contains inline asm code for retrieving "high-performance"
** counters for x86 class CPUs.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifndef _HWTIME_H_
#define _HWTIME_H_
@@ -25095,7 +25095,7 @@
**
** This file contains code that is specific to windows.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#if SQLITE_OS_WIN /* This file is used for windows only */
@@ -25163,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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifndef _OS_COMMON_H_
#define _OS_COMMON_H_
@@ -25234,7 +25234,7 @@
** This file contains inline asm code for retrieving "high-performance"
** counters for x86 class CPUs.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifndef _HWTIME_H_
#define _HWTIME_H_
@@ -27051,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.12 2008/11/25 23:53:33 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/* Size of the Bitvec structure in bytes. */
@@ -27418,7 +27418,7 @@
*************************************************************************
** This file implements that page cache.
**
-** @(#) $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -28006,7 +28006,7 @@
** If the default page cache implementation is overriden, then neither of
** these two features are available.
**
-** @(#) $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
@@ -28747,7 +28747,7 @@
** file simultaneously, or one process from reading the database while
** another is writing.
**
-** @(#) $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifndef SQLITE_OMIT_DISKIO
@@ -29789,9 +29789,6 @@
return cksum;
}
-/* Forward declaration */
-static void makeClean(PgHdr*);
-
/*
** Read a single page from the journal file opened on file descriptor
** jfd. Playback this one page.
@@ -29901,7 +29898,9 @@
if( pPager->xReiniter ){
pPager->xReiniter(pPg);
}
- if( isMainJrnl ) makeClean(pPg);
+ if( isMainJrnl ){
+ sqlite3PcacheMakeClean(pPg);
+ }
#ifdef SQLITE_CHECK_PAGES
pPg->pageHash = pager_pagehash(pPg);
#endif
@@ -31823,23 +31822,6 @@
}
/*
-** Make a page dirty. Set its dirty flag and add it to the dirty
-** page list.
-*/
-static void makeDirty(PgHdr *pPg){
- sqlite3PcacheMakeDirty(pPg);
-}
-
-/*
-** Make a page clean. Clear its dirty bit and remove it from the
-** dirty page list.
-*/
-static void makeClean(PgHdr *pPg){
- sqlite3PcacheMakeClean(pPg);
-}
-
-
-/*
** Mark a data page as writeable. The page is written into the journal
** if it is not there already. This routine must be called before making
** changes to a page.
@@ -31890,7 +31872,7 @@
/* Mark the page as dirty. If the page has already been written
** to the journal then we can return right away.
*/
- makeDirty(pPg);
+ sqlite3PcacheMakeDirty(pPg);
if( pageInJournal(pPg) && (pageInStatement(pPg) || pPager->stmtInUse==0) ){
pPager->dirtyCache = 1;
pPager->dbModified = 1;
@@ -32797,7 +32779,7 @@
*/
if( (pPg->flags&PGHDR_NEED_SYNC) && !isCommit ){
needSyncPgno = pPg->pgno;
- assert( pageInJournal(pPg) || pgno>pPager->origDbSize );
+ assert( pageInJournal(pPg) || pPg->pgno>pPager->origDbSize );
assert( pPg->flags&PGHDR_DIRTY );
assert( pPager->needSync );
}
@@ -32819,7 +32801,7 @@
sqlite3PcacheDrop(pPgOld);
}
- makeDirty(pPg);
+ sqlite3PcacheMakeDirty(pPg);
pPager->dirtyCache = 1;
pPager->dbModified = 1;
@@ -32854,7 +32836,7 @@
pPager->needSync = 1;
assert( pPager->noSync==0 && !MEMDB );
pPgHdr->flags |= PGHDR_NEED_SYNC;
- makeDirty(pPgHdr);
+ sqlite3PcacheMakeDirty(pPgHdr);
sqlite3PagerUnref(pPgHdr);
}
@@ -32960,7 +32942,7 @@
**
*************************************************************************
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac 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
@@ -32980,7 +32962,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
**
** This file implements a external (disk-based) database using BTrees.
** For a detailed discussion of BTrees, refer to
@@ -33913,7 +33895,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
**
** This file implements a external (disk-based) database using BTrees.
** See the header comment on "btreeInt.h" for additional information.
@@ -36830,6 +36812,7 @@
for(i=0; i<=pTempCur->iPage; i++){
sqlite3PagerRef(pTempCur->apPage[i]->pDbPage);
}
+ assert( pTempCur->pKey==0 );
}
/*
@@ -36842,6 +36825,7 @@
for(i=0; i<=pCur->iPage; i++){
sqlite3PagerUnref(pCur->apPage[i]->pDbPage);
}
+ sqlite3_free(pCur->pKey);
}
/*
@@ -39962,6 +39946,9 @@
}
if( rc==SQLITE_OK ){
+ rc = sqlite3PagerWrite(pLeafPage->pDbPage);
+ }
+ if( rc==SQLITE_OK ){
dropCell(pLeafPage, 0, szNext);
VVA_ONLY( leafCur.pagesShuffled = 0 );
rc = balance(&leafCur, 0);
@@ -41360,7 +41347,7 @@
** This file implements a FIFO queue of rowids used for processing
** UPDATE and DELETE statements.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -41494,7 +41481,7 @@
** only within the VDBE. Interface routines refer to a Mem using the
** name sqlite_value
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -42540,7 +42527,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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
@@ -45023,7 +45010,7 @@
** This file contains code use to implement APIs that are part of the
** VDBE.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#if 0 && defined(SQLITE_ENABLE_MEMORY_MANAGEMENT)
@@ -46363,7 +46350,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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -46799,7 +46786,7 @@
** This file contains inline asm code for retrieving "high-performance"
** counters for x86 class CPUs.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifndef _HWTIME_H_
#define _HWTIME_H_
@@ -51563,7 +51550,7 @@
**
** This file contains code used to implement incremental BLOB I/O.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
@@ -51910,7 +51897,7 @@
**
*************************************************************************
**
-** @(#) $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifdef SQLITE_ENABLE_ATOMIC_WRITE
@@ -52155,7 +52142,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.12 2008/11/25 23:53:33 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/* Forward references to internal structures */
@@ -52400,7 +52387,7 @@
** This file contains routines used for walking the parser tree for
** an SQL statement.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
@@ -52536,7 +52523,7 @@
** resolve all identifiers by associating them with a particular
** table and column.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -53703,7 +53690,7 @@
** This file contains routines used for analyzing expressions and
** for generating VDBE code that evaluates expressions in SQLite.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -56805,7 +56792,7 @@
** This file contains C code routines that used to generate VDBE code
** that implements the ALTER TABLE command.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -57429,7 +57416,7 @@
*************************************************************************
** This file contains code associated with the ANALYZE command.
**
-** @(#) $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifndef SQLITE_OMIT_ANALYZE
@@ -57858,7 +57845,7 @@
*************************************************************************
** This file contains code used to implement the ATTACH and DETACH commands.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifndef SQLITE_OMIT_ATTACH
@@ -58401,7 +58388,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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -58645,7 +58632,7 @@
** COMMIT
** ROLLBACK
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -62217,7 +62204,7 @@
** This file contains functions used to access the internal hash tables
** of user defined functions and collation sequences.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
@@ -62669,7 +62656,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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -63310,7 +63297,7 @@
** sqliteRegisterBuildinFunctions() found at the bottom of the file.
** All other code has file scope.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -64705,7 +64692,7 @@
** This file contains C code routines that are called by the parser
** to handle INSERT statements in SQLite.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -66445,7 +66432,7 @@
** other files are for internal use by SQLite and should not be
** accessed by users of the library.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
@@ -66590,7 +66577,7 @@
** This file contains code used to dynamically load extensions into
** the SQLite library.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifndef SQLITE_CORE
@@ -66615,7 +66602,7 @@
** as extensions by SQLite should #include this file instead of
** sqlite3.h.
**
-** @(#) $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifndef _SQLITE3EXT_H_
#define _SQLITE3EXT_H_
@@ -67576,7 +67563,7 @@
*************************************************************************
** This file contains code used to implement the PRAGMA command.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/* Ignore this whole file if pragmas are disabled
@@ -68933,7 +68920,7 @@
** interface, and routines that contribute to loading the database schema
** from disk.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -69745,7 +69732,7 @@
** This file contains C code routines that are called by the parser
** to handle SELECT statements in SQLite.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
@@ -73932,7 +73919,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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifndef SQLITE_OMIT_GET_TABLE
@@ -74127,7 +74114,7 @@
*************************************************************************
**
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifndef SQLITE_OMIT_TRIGGER
@@ -74982,7 +74969,7 @@
** This file contains C code routines that are called by the parser
** to handle UPDATE statements.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifndef SQLITE_OMIT_VIRTUALTABLE
@@ -75667,7 +75654,7 @@
** Most of the code in this file may be omitted by defining the
** SQLITE_OMIT_VACUUM macro.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#if !defined(SQLITE_OMIT_VACUUM) && !defined(SQLITE_OMIT_ATTACH)
@@ -75965,7 +75952,7 @@
*************************************************************************
** This file contains code used to help implement virtual tables.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifndef SQLITE_OMIT_VIRTUALTABLE
@@ -76813,7 +76800,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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -82933,7 +82920,7 @@
** individual tokens and sends those tokens one-by-one over to the
** parser for analysis.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
/*
@@ -82986,7 +82973,7 @@
**
** The code in this file has been automatically generated by
**
-** $Header: /repository/php-src/ext/sqlite3/libsqlite/sqlite3.c,v 1.12
2008/11/25 23:53:33 iliaa Exp $
+** $Header: /repository/php-src/ext/sqlite3/libsqlite/sqlite3.c,v 1.13
2008/11/27 08:40:50 scottmac 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
@@ -83566,7 +83553,7 @@
** separating it out, the code will be automatically omitted from
** static links that do not use it.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifndef SQLITE_OMIT_COMPLETE
@@ -83843,7 +83830,7 @@
** other files are for internal use by SQLite and should not be
** accessed by users of the library.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#ifdef SQLITE_ENABLE_FTS3
@@ -95126,7 +95113,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.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_RTREE)
@@ -97980,7 +97967,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
**
** This file implements an integration between the ICU library
** ("International Components for Unicode", an open-source library
@@ -98481,7 +98468,7 @@
*************************************************************************
** This file implements a tokenizer for fts3 based on the ICU library.
**
-** $Id: sqlite3.c,v 1.12 2008/11/25 23:53:33 iliaa Exp $
+** $Id: sqlite3.c,v 1.13 2008/11/27 08:40:50 scottmac Exp $
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.h?r1=1.10&r2=1.11&diff_format=u
Index: php-src/ext/sqlite3/libsqlite/sqlite3.h
diff -u php-src/ext/sqlite3/libsqlite/sqlite3.h:1.10
php-src/ext/sqlite3/libsqlite/sqlite3.h:1.11
--- php-src/ext/sqlite3/libsqlite/sqlite3.h:1.10 Tue Nov 25 23:53:34 2008
+++ php-src/ext/sqlite3/libsqlite/sqlite3.h Thu Nov 27 08:40:58 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.10 2008/11/25 23:53:34 iliaa Exp $
+** @(#) $Id: sqlite3.h,v 1.11 2008/11/27 08:40:58 scottmac 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.1"
+#define SQLITE_VERSION "3.6.6.2"
#define SQLITE_VERSION_NUMBER 3006006
/*
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3ext.h?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/sqlite3/libsqlite/sqlite3ext.h
diff -u php-src/ext/sqlite3/libsqlite/sqlite3ext.h:1.9
php-src/ext/sqlite3/libsqlite/sqlite3ext.h:1.10
--- php-src/ext/sqlite3/libsqlite/sqlite3ext.h:1.9 Tue Nov 25 23:53:34 2008
+++ php-src/ext/sqlite3/libsqlite/sqlite3ext.h Thu Nov 27 08:40:58 2008
@@ -15,7 +15,7 @@
** as extensions by SQLite should #include this file instead of
** sqlite3.h.
**
-** @(#) $Id: sqlite3ext.h,v 1.9 2008/11/25 23:53:34 iliaa Exp $
+** @(#) $Id: sqlite3ext.h,v 1.10 2008/11/27 08:40:58 scottmac Exp $
*/
#ifndef _SQLITE3EXT_H_
#define _SQLITE3EXT_H_
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
