scottmac Thu May 28 03:20:47 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite3/libsqlite sqlite3.c sqlite3.h
Log:
MFH sync SQLite 3.6.14.2
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.c?r1=1.1.2.23&r2=1.1.2.24&diff_format=u
Index: php-src/ext/sqlite3/libsqlite/sqlite3.c
diff -u php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.23
php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.24
--- php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.23 Tue May 19 18:42:08 2009
+++ php-src/ext/sqlite3/libsqlite/sqlite3.c Thu May 28 03:20:15 2009
@@ -4,7 +4,7 @@
/******************************************************************************
** This file is an amalgamation of many separate C source files from SQLite
-** version 3.6.14.1. By combining all the individual C code files into this
+** version 3.6.14.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 2009-05-18 18:33:54 UTC.
+** This amalgamation was generated on 2009-05-25 12:49:40 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.23 2009/05/19 18:42:08 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 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.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac 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.23 2009/05/19 18:42:08 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef _SQLITE3_H_
#define _SQLITE3_H_
@@ -601,7 +601,7 @@
**
** Requirements: [H10011] [H10014]
*/
-#define SQLITE_VERSION "3.6.14.1"
+#define SQLITE_VERSION "3.6.14.2"
#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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac 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.23 2009/05/19 18:42:08 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac 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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac 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.23 2009/05/19 18:42:08 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac 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.23 2009/05/19 18:42:08 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef _PCACHE_H_
@@ -7595,7 +7595,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef _SQLITE_OS_H_
#define _SQLITE_OS_H_
@@ -7871,7 +7871,7 @@
** Source files should #include the sqliteInt.h file and let that file
** include this one indirectly.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
@@ -10185,7 +10185,7 @@
**
** This file contains definitions of global variables and contants.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
@@ -10378,7 +10378,7 @@
** This module implements the sqlite3_status() interface and related
** functionality.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -10505,7 +10505,7 @@
** sqlite3RegisterDateTimeFunctions() found at the bottom of the file.
** All other code has file scope.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 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
@@ -11610,7 +11610,7 @@
** This file contains OS interface code that is common to all
** architectures.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#define _SQLITE_OS_C_ 1
#undef _SQLITE_OS_C_
@@ -11890,7 +11890,7 @@
**
*************************************************************************
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -11989,7 +11989,7 @@
** are merely placeholders. Real drivers must be substituted using
** sqlite3_config() before SQLite will operate.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -12053,7 +12053,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -12202,7 +12202,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -12651,7 +12651,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -13341,7 +13341,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -13822,7 +13822,7 @@
** This file contains code that is common across all mutex implementations.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef SQLITE_MUTEX_OMIT
@@ -13984,7 +13984,7 @@
** that does error checking on mutexes to make sure they are being
** called correctly.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
@@ -14158,7 +14158,7 @@
*************************************************************************
** This file contains the C functions that implement mutexes for OS/2
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -14433,7 +14433,7 @@
*************************************************************************
** This file contains the C functions that implement mutexes for pthreads
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -14763,7 +14763,7 @@
*************************************************************************
** This file contains the C functions that implement mutexes for win32
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -15022,7 +15022,7 @@
**
** Memory allocation functions used throughout sqlite.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -15734,7 +15734,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
**
**************************************************************************
**
@@ -16701,7 +16701,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
@@ -16847,7 +16847,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
**
** Notes on UTF-8:
**
@@ -16889,7 +16889,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef _VDBEINT_H_
#define _VDBEINT_H_
@@ -17801,7 +17801,7 @@
** This file contains functions for allocating memory, comparing
** strings, and stuff like that.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifdef SQLITE_HAVE_ISNAN
# include <math.h>
@@ -18851,7 +18851,7 @@
** This is the implementation of generic hash-tables
** used in SQLite.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/* Turn bulk memory into a hash table object by initializing the
@@ -19287,7 +19287,7 @@
**
** This file contains code that is specific to OS/2.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
@@ -19350,7 +19350,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef _OS_COMMON_H_
#define _OS_COMMON_H_
@@ -19412,7 +19412,7 @@
** This file contains inline asm code for retrieving "high-performance"
** counters for x86 class CPUs.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef _HWTIME_H_
#define _HWTIME_H_
@@ -20670,7 +20670,7 @@
** * Definitions of sqlite3_vfs objects for all locking methods
** plus implementations of sqlite3_os_init() and sqlite3_os_end().
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#if SQLITE_OS_UNIX /* This file is used on unix only */
@@ -20866,7 +20866,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef _OS_COMMON_H_
#define _OS_COMMON_H_
@@ -20928,7 +20928,7 @@
** This file contains inline asm code for retrieving "high-performance"
** counters for x86 class CPUs.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef _HWTIME_H_
#define _HWTIME_H_
@@ -26005,7 +26005,7 @@
**
** This file contains code that is specific to windows.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#if SQLITE_OS_WIN /* This file is used for windows only */
@@ -26073,7 +26073,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef _OS_COMMON_H_
#define _OS_COMMON_H_
@@ -26135,7 +26135,7 @@
** This file contains inline asm code for retrieving "high-performance"
** counters for x86 class CPUs.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef _HWTIME_H_
#define _HWTIME_H_
@@ -28130,7 +28130,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.23 2009/05/19 18:42:08 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/* Size of the Bitvec structure in bytes. */
@@ -28505,7 +28505,7 @@
*************************************************************************
** This file implements that page cache.
**
-** @(#) $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -29094,7 +29094,7 @@
** If the default page cache implementation is overriden, then neither of
** these two features are available.
**
-** @(#) $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
@@ -29896,7 +29896,7 @@
** There is an added cost of O(N) when switching between TEST and
** SMALLEST primitives.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
@@ -30280,7 +30280,7 @@
** file simultaneously, or one process from reading the database while
** another is writing.
**
-** @(#) $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef SQLITE_OMIT_DISKIO
@@ -35544,7 +35544,7 @@
**
*************************************************************************
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 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
@@ -35564,7 +35564,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
**
** This file implements a external (disk-based) database using BTrees.
** For a detailed discussion of BTrees, refer to
@@ -36544,7 +36544,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
**
** This file implements a external (disk-based) database using BTrees.
** See the header comment on "btreeInt.h" for additional information.
@@ -44245,7 +44245,7 @@
** This file contains the implementation of the sqlite3_backup_XXX()
** API functions and the related features.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/* Macro to find the minimum of two numeric values.
@@ -44868,7 +44868,7 @@
** only within the VDBE. Interface routines refer to a Mem using the
** name sqlite_value
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -45927,7 +45927,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
@@ -48620,7 +48620,7 @@
** This file contains code use to implement APIs that are part of the
** VDBE.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#if 0 && defined(SQLITE_ENABLE_MEMORY_MANAGEMENT)
@@ -49999,7 +49999,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -50428,7 +50428,7 @@
** This file contains inline asm code for retrieving "high-performance"
** counters for x86 class CPUs.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef _HWTIME_H_
#define _HWTIME_H_
@@ -55515,7 +55515,7 @@
**
** This file contains code used to implement incremental BLOB I/O.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
@@ -55864,7 +55864,7 @@
**
*************************************************************************
**
-** @(#) $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifdef SQLITE_ENABLE_ATOMIC_WRITE
@@ -56110,7 +56110,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.23 2009/05/19 18:42:08 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/* Forward references to internal structures */
@@ -56369,7 +56369,7 @@
** This file contains routines used for walking the parser tree for
** an SQL statement.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
@@ -56510,7 +56510,7 @@
** resolve all identifiers by associating them with a particular
** table and column.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -57684,7 +57684,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -59474,6 +59474,22 @@
}
/*
+** When a cached column is reused, make sure that its register is
+** no longer available as a temp register. ticket #3879: that same
+** register might be in the cache in multiple places, so be sure to
+** get them all.
+*/
+static void sqlite3ExprCachePinRegister(Parse *pParse, int iReg){
+ int i;
+ struct yColCache *p;
+ for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){
+ if( p->iReg==iReg ){
+ p->tempReg = 0;
+ }
+ }
+}
+
+/*
** Generate code that will extract the iColumn-th column from
** table pTab and store the column value in a register. An effort
** is made to store the column value in register iReg, but this is
@@ -59508,7 +59524,7 @@
VdbeComment((v, "OPT: tab%d.col%d -> r%d", iTable, iColumn, p->iReg));
#endif
p->lru = pParse->iCacheCnt++;
- p->tempReg = 0; /* This pins the register, but also leaks it */
+ sqlite3ExprCachePinRegister(pParse, p->iReg);
return p->iReg;
}
}
@@ -61078,7 +61094,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -61708,7 +61724,7 @@
*************************************************************************
** This file contains code associated with the ANALYZE command.
**
-** @(#) $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef SQLITE_OMIT_ANALYZE
@@ -62142,7 +62158,7 @@
*************************************************************************
** This file contains code used to implement the ATTACH and DETACH commands.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef SQLITE_OMIT_ATTACH
@@ -62685,7 +62701,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -62930,7 +62946,7 @@
** COMMIT
** ROLLBACK
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -66577,7 +66593,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
@@ -67031,7 +67047,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -67649,7 +67665,7 @@
** sqliteRegisterBuildinFunctions() found at the bottom of the file.
** All other code has file scope.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -69122,7 +69138,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -70886,7 +70902,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
@@ -71029,7 +71045,7 @@
** This file contains code used to dynamically load extensions into
** the SQLite library.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef SQLITE_CORE
@@ -71054,7 +71070,7 @@
** as extensions by SQLite should #include this file instead of
** sqlite3.h.
**
-** @(#) $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** @(#) $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef _SQLITE3EXT_H_
#define _SQLITE3EXT_H_
@@ -72015,7 +72031,7 @@
*************************************************************************
** This file contains code used to implement the PRAGMA command.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/* Ignore this whole file if pragmas are disabled
@@ -73449,7 +73465,7 @@
** interface, and routines that contribute to loading the database schema
** from disk.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -74281,7 +74297,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
@@ -78558,7 +78574,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef SQLITE_OMIT_GET_TABLE
@@ -78751,7 +78767,7 @@
*************************************************************************
**
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef SQLITE_OMIT_TRIGGER
@@ -79629,7 +79645,7 @@
** This file contains C code routines that are called by the parser
** to handle UPDATE statements.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef SQLITE_OMIT_VIRTUALTABLE
@@ -80318,7 +80334,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#if !defined(SQLITE_OMIT_VACUUM) && !defined(SQLITE_OMIT_ATTACH)
@@ -80618,7 +80634,7 @@
*************************************************************************
** This file contains code used to help implement virtual tables.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef SQLITE_OMIT_VIRTUALTABLE
@@ -81477,7 +81493,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -88324,7 +88340,7 @@
** individual tokens and sends those tokens one-by-one over to the
** parser for analysis.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/*
@@ -88377,7 +88393,7 @@
**
** The code in this file has been automatically generated by
**
-** $Header: /repository/php-src/ext/sqlite3/libsqlite/sqlite3.c,v 1.1.2.23
2009/05/19 18:42:08 iliaa Exp $
+** $Header: /repository/php-src/ext/sqlite3/libsqlite/sqlite3.c,v 1.1.2.24
2009/05/28 03:20:15 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
@@ -89119,7 +89135,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifndef SQLITE_OMIT_COMPLETE
@@ -89396,7 +89412,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#ifdef SQLITE_ENABLE_FTS3
@@ -91686,7 +91702,7 @@
** This file contains the implementation of the sqlite3_unlock_notify()
** API method and its associated functionality.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
/* Omit this entire file if SQLITE_ENABLE_UNLOCK_NOTIFY is not defined. */
@@ -101898,7 +101914,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.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_RTREE)
@@ -104753,7 +104769,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 scottmac Exp $
**
** This file implements an integration between the ICU library
** ("International Components for Unicode", an open-source library
@@ -105254,7 +105270,7 @@
*************************************************************************
** This file implements a tokenizer for fts3 based on the ICU library.
**
-** $Id: sqlite3.c,v 1.1.2.23 2009/05/19 18:42:08 iliaa Exp $
+** $Id: sqlite3.c,v 1.1.2.24 2009/05/28 03:20:15 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.1.2.18&r2=1.1.2.19&diff_format=u
Index: php-src/ext/sqlite3/libsqlite/sqlite3.h
diff -u php-src/ext/sqlite3/libsqlite/sqlite3.h:1.1.2.18
php-src/ext/sqlite3/libsqlite/sqlite3.h:1.1.2.19
--- php-src/ext/sqlite3/libsqlite/sqlite3.h:1.1.2.18 Tue May 19 18:32:45 2009
+++ php-src/ext/sqlite3/libsqlite/sqlite3.h Thu May 28 03:20:33 2009
@@ -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.18 2009/05/19 18:32:45 iliaa Exp $
+** @(#) $Id: sqlite3.h,v 1.1.2.19 2009/05/28 03:20:33 scottmac Exp $
*/
#ifndef _SQLITE3_H_
#define _SQLITE3_H_
@@ -99,7 +99,7 @@
**
** Requirements: [H10011] [H10014]
*/
-#define SQLITE_VERSION "3.6.14.1"
+#define SQLITE_VERSION "3.6.14.2"
#define SQLITE_VERSION_NUMBER 3006014
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
