mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
MFB: Upgrade to SQLite 3.6.13
This commit is contained in:
parent
bfc0a87a0d
commit
c63252ff15
2 changed files with 1329 additions and 994 deletions
File diff suppressed because it is too large
Load diff
|
@ -99,8 +99,8 @@ extern "C" {
|
|||
**
|
||||
** Requirements: [H10011] [H10014]
|
||||
*/
|
||||
#define SQLITE_VERSION "3.6.12"
|
||||
#define SQLITE_VERSION_NUMBER 3006012
|
||||
#define SQLITE_VERSION "3.6.13"
|
||||
#define SQLITE_VERSION_NUMBER 3006013
|
||||
|
||||
/*
|
||||
** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100>
|
||||
|
@ -382,7 +382,6 @@ int sqlite3_exec(
|
|||
#define SQLITE_IOERR_LOCK (SQLITE_IOERR | (15<<8))
|
||||
#define SQLITE_IOERR_CLOSE (SQLITE_IOERR | (16<<8))
|
||||
#define SQLITE_IOERR_DIR_CLOSE (SQLITE_IOERR | (17<<8))
|
||||
|
||||
#define SQLITE_LOCKED_SHAREDCACHE (SQLITE_LOCKED | (1<<8) )
|
||||
|
||||
/*
|
||||
|
@ -462,8 +461,9 @@ int sqlite3_exec(
|
|||
**
|
||||
** When the SQLITE_SYNC_DATAONLY flag is used, it means that the
|
||||
** sync operation only needs to flush data to mass storage. Inode
|
||||
** information need not be flushed. The SQLITE_SYNC_NORMAL flag means
|
||||
** to use normal fsync() semantics. The SQLITE_SYNC_FULL flag means
|
||||
** information need not be flushed. If the lower four bits of the flag
|
||||
** equal SQLITE_SYNC_NORMAL, that means to use normal fsync() semantics.
|
||||
** If the lower four bits equal SQLITE_SYNC_FULL, that means
|
||||
** to use Mac OS X style fullsync instead of fsync().
|
||||
*/
|
||||
#define SQLITE_SYNC_NORMAL 0x00002
|
||||
|
@ -2229,7 +2229,8 @@ int sqlite3_limit(sqlite3*, int id, int newVal);
|
|||
** program using one of these routines.
|
||||
**
|
||||
** The first argument, "db", is a [database connection] obtained from a
|
||||
** prior call to [sqlite3_open()], [sqlite3_open_v2()] or [sqlite3_open16()].
|
||||
** prior successful call to [sqlite3_open()], [sqlite3_open_v2()] or
|
||||
** [sqlite3_open16()]. The database connection must not have been closed.
|
||||
**
|
||||
** The second argument, "zSql", is the statement to be compiled, encoded
|
||||
** as either UTF-8 or UTF-16. The sqlite3_prepare() and sqlite3_prepare_v2()
|
||||
|
@ -2246,17 +2247,18 @@ int sqlite3_limit(sqlite3*, int id, int newVal);
|
|||
** is equal to the number of bytes in the input string <i>including</i>
|
||||
** the nul-terminator bytes.
|
||||
**
|
||||
** *pzTail is made to point to the first byte past the end of the
|
||||
** first SQL statement in zSql. These routines only compile the first
|
||||
** statement in zSql, so *pzTail is left pointing to what remains
|
||||
** uncompiled.
|
||||
** If pzTail is not NULL then *pzTail is made to point to the first byte
|
||||
** past the end of the first SQL statement in zSql. These routines only
|
||||
** compile the first statement in zSql, so *pzTail is left pointing to
|
||||
** what remains uncompiled.
|
||||
**
|
||||
** *ppStmt is left pointing to a compiled [prepared statement] that can be
|
||||
** executed using [sqlite3_step()]. If there is an error, *ppStmt is set
|
||||
** to NULL. If the input text contains no SQL (if the input is an empty
|
||||
** string or a comment) then *ppStmt is set to NULL.
|
||||
** {A13018} The calling procedure is responsible for deleting the compiled
|
||||
** The calling procedure is responsible for deleting the compiled
|
||||
** SQL statement using [sqlite3_finalize()] after it has finished with it.
|
||||
** ppStmt may not be NULL.
|
||||
**
|
||||
** On success, [SQLITE_OK] is returned, otherwise an [error code] is returned.
|
||||
**
|
||||
|
@ -3630,10 +3632,24 @@ int sqlite3_sleep(int);
|
|||
** is a NULL pointer, then SQLite performs a search for an appropriate
|
||||
** temporary file directory.
|
||||
**
|
||||
** It is not safe to modify this variable once a [database connection]
|
||||
** has been opened. It is intended that this variable be set once
|
||||
** It is not safe to read or modify this variable in more than one
|
||||
** thread at a time. It is not safe to read or modify this variable
|
||||
** if a [database connection] is being used at the same time in a separate
|
||||
** thread.
|
||||
** It is intended that this variable be set once
|
||||
** as part of process initialization and before any SQLite interface
|
||||
** routines have been call and remain unchanged thereafter.
|
||||
** routines have been called and that this variable remain unchanged
|
||||
** thereafter.
|
||||
**
|
||||
** The [temp_store_directory pragma] may modify this variable and cause
|
||||
** it to point to memory obtained from [sqlite3_malloc]. Furthermore,
|
||||
** the [temp_store_directory pragma] always assumes that any string
|
||||
** that this variable points to is held in memory obtained from
|
||||
** [sqlite3_malloc] and the pragma may attempt to free that memory
|
||||
** using [sqlite3_free].
|
||||
** Hence, if this variable is modified directly, either it should be
|
||||
** made NULL or made to point to memory obtained from [sqlite3_malloc]
|
||||
** or else the use of the [temp_store_directory pragma] should be avoided.
|
||||
*/
|
||||
SQLITE_EXTERN char *sqlite3_temp_directory;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue