pajoye Sat Nov 22 13:41:41 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite3/libsqlite sqlite3.c
Log:
- Fix windows build
please keep the fixes while merging the new versions.
if the updates do not contain the fixes, create a little todo list so it is
not forgotten (wiki)
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.c?r1=1.1.2.9&r2=1.1.2.10&diff_format=u
Index: php-src/ext/sqlite3/libsqlite/sqlite3.c
diff -u php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.9
php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.10
--- php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.9 Sat Nov 22 11:05:51 2008
+++ php-src/ext/sqlite3/libsqlite/sqlite3.c Sat Nov 22 13:41:21 2008
@@ -45,7 +45,7 @@
*************************************************************************
** Internal interface definitions for SQLite.
**
-** @(#) $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye 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.9 2008/11/22 11:05:51 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -401,16 +401,12 @@
** 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"
#endif
-#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\
- defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\
- defined(SQLITE_POW2_MEMORY_SIZE)==0
+#if
defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+defined(SQLITE_POW2_MEMORY_SIZE)==0
# define SQLITE_SYSTEM_MALLOC 1
#endif
@@ -491,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.9 2008/11/22 11:05:51 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef _SQLITE3_H_
#define _SQLITE3_H_
@@ -7206,7 +7202,7 @@
** This is the header file for the generic hash-table implemenation
** used in SQLite.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef _SQLITE_HASH_H_
#define _SQLITE_HASH_H_
@@ -7757,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.9 2008/11/22 11:05:51 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef _BTREE_H_
#define _BTREE_H_
@@ -7988,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef _SQLITE_VDBE_H_
#define _SQLITE_VDBE_H_
@@ -8379,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.9 2008/11/22 11:05:51 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef _PAGER_H_
@@ -8525,7 +8521,7 @@
** This header file defines the interface that the sqlite page cache
** subsystem.
**
-** @(#) $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef _PCACHE_H_
@@ -8693,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef _SQLITE_OS_H_
#define _SQLITE_OS_H_
@@ -8975,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
@@ -11075,7 +11071,7 @@
**
** This file contains definitions of global variables and contants.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
@@ -11163,7 +11159,7 @@
** This module implements the sqlite3_status() interface and related
** functionality.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -11290,7 +11286,7 @@
** sqlite3RegisterDateTimeFunctions() found at the bottom of the file.
** All other code has file scope.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
**
** SQLite processes all times and dates as Julian Day numbers. The
** dates and times are stored as the number of days since noon
@@ -12369,7 +12365,7 @@
** This file contains OS interface code that is common to all
** architectures.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#define _SQLITE_OS_C_ 1
#undef _SQLITE_OS_C_
@@ -12646,7 +12642,7 @@
**
*************************************************************************
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -12745,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -12809,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -12958,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -13401,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -14091,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -14572,7 +14568,7 @@
** This file contains code that is common across all mutex implementations.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef SQLITE_MUTEX_OMIT
@@ -14732,7 +14728,7 @@
** that does error checking on mutexes to make sure they are being
** called correctly.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
@@ -14906,7 +14902,7 @@
*************************************************************************
** This file contains the C functions that implement mutexes for OS/2
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -15181,7 +15177,7 @@
*************************************************************************
** This file contains the C functions that implement mutexes for pthreads
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -15508,7 +15504,7 @@
*************************************************************************
** This file contains the C functions that implement mutexes for win32
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -15762,7 +15758,7 @@
**
** Memory allocation functions used throughout sqlite.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -16544,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
**
**************************************************************************
**
@@ -17487,7 +17483,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
@@ -17633,7 +17629,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
**
** Notes on UTF-8:
**
@@ -17675,7 +17671,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef _VDBEINT_H_
#define _VDBEINT_H_
@@ -18596,7 +18592,7 @@
** This file contains functions for allocating memory, comparing
** strings, and stuff like that.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
@@ -19546,7 +19542,7 @@
** This is the implementation of generic hash-tables
** used in SQLite.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/* Turn bulk memory into a hash table object by initializing the
@@ -20005,7 +20001,7 @@
**
** This file contains code that is specific to OS/2.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
@@ -20068,7 +20064,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef _OS_COMMON_H_
#define _OS_COMMON_H_
@@ -20139,7 +20135,7 @@
** This file contains inline asm code for retrieving "high-performance"
** counters for x86 class CPUs.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef _HWTIME_H_
#define _HWTIME_H_
@@ -21360,7 +21356,7 @@
**
** This file contains code that is specific to Unix systems.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#if SQLITE_OS_UNIX /* This file is used on unix only */
@@ -21515,7 +21511,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef _OS_COMMON_H_
#define _OS_COMMON_H_
@@ -21586,7 +21582,7 @@
** This file contains inline asm code for retrieving "high-performance"
** counters for x86 class CPUs.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef _HWTIME_H_
#define _HWTIME_H_
@@ -25096,7 +25092,7 @@
**
** This file contains code that is specific to windows.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#if SQLITE_OS_WIN /* This file is used for windows only */
@@ -25164,7 +25160,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef _OS_COMMON_H_
#define _OS_COMMON_H_
@@ -25235,7 +25231,7 @@
** This file contains inline asm code for retrieving "high-performance"
** counters for x86 class CPUs.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef _HWTIME_H_
#define _HWTIME_H_
@@ -27046,7 +27042,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.9 2008/11/22 11:05:51 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/* Size of the Bitvec structure in bytes. */
@@ -27413,7 +27409,7 @@
*************************************************************************
** This file implements that page cache.
**
-** @(#) $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -28001,7 +27997,7 @@
** If the default page cache implementation is overriden, then neither of
** these two features are available.
**
-** @(#) $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
@@ -28742,7 +28738,7 @@
** file simultaneously, or one process from reading the database while
** another is writing.
**
-** @(#) $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef SQLITE_OMIT_DISKIO
@@ -32955,7 +32951,7 @@
**
*************************************************************************
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye 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
@@ -32975,7 +32971,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
**
** This file implements a external (disk-based) database using BTrees.
** For a detailed discussion of BTrees, refer to
@@ -33908,7 +33904,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
**
** This file implements a external (disk-based) database using BTrees.
** See the header comment on "btreeInt.h" for additional information.
@@ -41352,7 +41348,7 @@
** This file implements a FIFO queue of rowids used for processing
** UPDATE and DELETE statements.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -41486,7 +41482,7 @@
** only within the VDBE. Interface routines refer to a Mem using the
** name sqlite_value
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -42532,7 +42528,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
@@ -45015,7 +45011,7 @@
** This file contains code use to implement APIs that are part of the
** VDBE.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#if 0 && defined(SQLITE_ENABLE_MEMORY_MANAGEMENT)
@@ -46355,7 +46351,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -46791,7 +46787,7 @@
** This file contains inline asm code for retrieving "high-performance"
** counters for x86 class CPUs.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef _HWTIME_H_
#define _HWTIME_H_
@@ -51555,7 +51551,7 @@
**
** This file contains code used to implement incremental BLOB I/O.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
@@ -51902,7 +51898,7 @@
**
*************************************************************************
**
-** @(#) $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifdef SQLITE_ENABLE_ATOMIC_WRITE
@@ -52147,7 +52143,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.9 2008/11/22 11:05:51 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/* Forward references to internal structures */
@@ -52392,7 +52388,7 @@
** This file contains routines used for walking the parser tree for
** an SQL statement.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
@@ -52528,7 +52524,7 @@
** resolve all identifiers by associating them with a particular
** table and column.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -53695,7 +53691,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -56797,7 +56793,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -57421,7 +57417,7 @@
*************************************************************************
** This file contains code associated with the ANALYZE command.
**
-** @(#) $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef SQLITE_OMIT_ANALYZE
@@ -57850,7 +57846,7 @@
*************************************************************************
** This file contains code used to implement the ATTACH and DETACH commands.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef SQLITE_OMIT_ATTACH
@@ -58393,7 +58389,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -58637,7 +58633,7 @@
** COMMIT
** ROLLBACK
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -62209,7 +62205,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
@@ -62661,7 +62657,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -63302,7 +63298,7 @@
** sqliteRegisterBuildinFunctions() found at the bottom of the file.
** All other code has file scope.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -64697,7 +64693,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -66437,7 +66433,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
@@ -66582,7 +66578,7 @@
** This file contains code used to dynamically load extensions into
** the SQLite library.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef SQLITE_CORE
@@ -66607,7 +66603,7 @@
** as extensions by SQLite should #include this file instead of
** sqlite3.h.
**
-** @(#) $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef _SQLITE3EXT_H_
#define _SQLITE3EXT_H_
@@ -67568,7 +67564,7 @@
*************************************************************************
** This file contains code used to implement the PRAGMA command.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/* Ignore this whole file if pragmas are disabled
@@ -68925,7 +68921,7 @@
** interface, and routines that contribute to loading the database schema
** from disk.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -69737,7 +69733,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
@@ -73924,7 +73920,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef SQLITE_OMIT_GET_TABLE
@@ -74119,7 +74115,7 @@
*************************************************************************
**
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef SQLITE_OMIT_TRIGGER
@@ -74974,7 +74970,7 @@
** This file contains C code routines that are called by the parser
** to handle UPDATE statements.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef SQLITE_OMIT_VIRTUALTABLE
@@ -75659,7 +75655,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#if !defined(SQLITE_OMIT_VACUUM) && !defined(SQLITE_OMIT_ATTACH)
@@ -75957,7 +75953,7 @@
*************************************************************************
** This file contains code used to help implement virtual tables.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef SQLITE_OMIT_VIRTUALTABLE
@@ -76805,7 +76801,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -82925,7 +82921,7 @@
** individual tokens and sends those tokens one-by-one over to the
** parser for analysis.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
/*
@@ -82978,7 +82974,7 @@
**
** The code in this file has been automatically generated by
**
-** $Header: /repository/php-src/ext/sqlite3/libsqlite/sqlite3.c,v 1.1.2.9
2008/11/22 11:05:51 scottmac Exp $
+** $Header: /repository/php-src/ext/sqlite3/libsqlite/sqlite3.c,v 1.1.2.10
2008/11/22 13:41:21 pajoye 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
@@ -83558,7 +83554,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifndef SQLITE_OMIT_COMPLETE
@@ -83835,7 +83831,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#ifdef SQLITE_ENABLE_FTS3
@@ -95118,7 +95114,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.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_RTREE)
@@ -97972,7 +97968,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
**
** This file implements an integration between the ICU library
** ("International Components for Unicode", an open-source library
@@ -98473,7 +98469,7 @@
*************************************************************************
** This file implements a tokenizer for fts3 based on the ICU library.
**
-** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $
+** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
