summaryrefslogtreecommitdiff
path: root/dist/sqlite3.h
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2017-05-23 20:08:46 +0000
committerNick Kralevich <nnk@google.com>2017-05-23 20:09:35 +0000
commit474de9dc715b92c3c3d546da70d69fa3c2bd56b5 (patch)
tree82c3decfa96efbd08f8beada2440f5365116c9fc /dist/sqlite3.h
parentdf94a5ddeff8b445868ed01f841d7c279b93395f (diff)
Revert "sqlite: Upgrade to SQLite 3.19.0"
Drive app crashes on launch. Root cause unknown. Searching for native crashes in /usr/local/google/tmp/tmpwroWkU Revision: 'rev_a' pid: 3813, tid: 3858, name: AppsPredictFetc >>> com.google.android.apps.docs <<< signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0x2 x0 000000725a046588 x1 000000725a112fc8 x2 ffffffffffffffff x3 0000000000000020 x4 0000000000000020 x5 0000000000000000 x6 0000000000000000 x7 ffffffffffffffff x8 0000000000000000 x9 0000000000000006 x10 0000000000000080 x11 0000000000000080 x12 0000000000000038 x13 000000725a111000 x14 0000000000000000 x15 003b9aca00000000 x16 0000007272bdabc0 x17 0000007272527500 x18 0000000000000020 x19 0000000000000017 x20 000000725a112908 x21 0000000000000006 x22 000000725a111000 x23 000000725a111000 x24 0000007272bc0ad0 x25 00000072593fd2f0 x26 000000725a09db10 x27 000000725a046400 x28 0000000000000000 x29 00000072593fd3c0 x30 0000007272b07668 sp 00000072593fd160 pc 0000007272b07824 pstate 0000000080000000 Using arm64 toolchain from: /usr/local/stackserver/master/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/ Stack Trace: RELADDR FUNCTION FILE:LINE 0000000000042824 sqlite3VdbeExec+6628 external/sqlite/dist/sqlite3.c:80728 v--------------> sqlite3Step external/sqlite/dist/sqlite3.c:76693 0000000000016ec4 sqlite3_step+2572 external/sqlite/dist/sqlite3.c:76754 00000000000e9ea8 android::nativeExecuteForCursorWindow(_JNIEnv*, _jclass*, long, long, long, int, int, unsigned char)+440 frameworks/base/core/jni/android_database_SQLiteConnection.cpp:696 This reverts commit df94a5ddeff8b445868ed01f841d7c279b93395f. Bug: 62025391 Change-Id: I4c3577529346880094d27bcffd39550b60c2e572
Diffstat (limited to 'dist/sqlite3.h')
-rw-r--r--dist/sqlite3.h49
1 files changed, 20 insertions, 29 deletions
diff --git a/dist/sqlite3.h b/dist/sqlite3.h
index 34e65c7..7e6afcb 100644
--- a/dist/sqlite3.h
+++ b/dist/sqlite3.h
@@ -121,9 +121,9 @@ extern "C" {
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
** [sqlite_version()] and [sqlite_source_id()].
*/
-#define SQLITE_VERSION "3.19.0"
-#define SQLITE_VERSION_NUMBER 3019000
-#define SQLITE_SOURCE_ID "2017-05-22 13:58:13 28a94eb282822cad1d1420f2dad6bf65e4b8b9062eda4a0b9ee8270b2c608e40"
+#define SQLITE_VERSION "3.18.0"
+#define SQLITE_VERSION_NUMBER 3018000
+#define SQLITE_SOURCE_ID "2017-03-28 18:48:43 424a0d380332858ee55bdebc4af3789f74e70a2b3ba1cf29d84b9b4bcf3e2e37"
/*
** CAPI3REF: Run-Time Library Version Numbers
@@ -857,7 +857,7 @@ struct sqlite3_io_methods {
** opcode allows these two values (10 retries and 25 milliseconds of delay)
** to be adjusted. The values are changed for all database connections
** within the same process. The argument is a pointer to an array of two
-** integers where the first integer is the new retry count and the second
+** integers where the first integer i the new retry count and the second
** integer is the delay. If either integer is negative, then the setting
** is not changed but instead the prior value of that setting is written
** into the array entry, allowing the current retry settings to be
@@ -2211,6 +2211,9 @@ SQLITE_API int sqlite3_total_changes(sqlite3*);
** ^A call to sqlite3_interrupt(D) that occurs when there are no running
** SQL statements is a no-op and has no effect on SQL statements
** that are started after the sqlite3_interrupt() call returns.
+**
+** If the database connection closes while [sqlite3_interrupt()]
+** is running then bad things will likely happen.
*/
SQLITE_API void sqlite3_interrupt(sqlite3*);
@@ -2673,7 +2676,6 @@ SQLITE_API void sqlite3_randomness(int N, void *P);
/*
** CAPI3REF: Compile-Time Authorization Callbacks
** METHOD: sqlite3
-** KEYWORDS: {authorizer callback}
**
** ^This routine registers an authorizer callback with a particular
** [database connection], supplied in the first argument.
@@ -2701,10 +2703,8 @@ SQLITE_API void sqlite3_randomness(int N, void *P);
** parameter to the sqlite3_set_authorizer() interface. ^The second parameter
** to the callback is an integer [SQLITE_COPY | action code] that specifies
** the particular action to be authorized. ^The third through sixth parameters
-** to the callback are either NULL pointers or zero-terminated strings
-** that contain additional details about the action to be authorized.
-** Applications must always be prepared to encounter a NULL pointer in any
-** of the third through the sixth parameters of the authorization callback.
+** to the callback are zero-terminated strings that contain additional
+** details about the action to be authorized.
**
** ^If the action code is [SQLITE_READ]
** and the callback returns [SQLITE_IGNORE] then the
@@ -2713,10 +2713,6 @@ SQLITE_API void sqlite3_randomness(int N, void *P);
** been read if [SQLITE_OK] had been returned. The [SQLITE_IGNORE]
** return can be used to deny an untrusted user access to individual
** columns of a table.
-** ^When a table is referenced by a [SELECT] but no column values are
-** extracted from that table (for example in a query like
-** "SELECT count(*) FROM tab") then the [SQLITE_READ] authorizer callback
-** is invoked once for that table with a column name that is an empty string.
** ^If the action code is [SQLITE_DELETE] and the callback returns
** [SQLITE_IGNORE] then the [DELETE] operation proceeds but the
** [truncate optimization] is disabled and all rows are deleted individually.
@@ -3709,7 +3705,7 @@ SQLITE_API int sqlite3_stmt_busy(sqlite3_stmt*);
** The [sqlite3_value_blob | sqlite3_value_type()] family of
** interfaces require protected sqlite3_value objects.
*/
-typedef struct sqlite3_value sqlite3_value;
+typedef struct Mem sqlite3_value;
/*
** CAPI3REF: SQL Function Context Object
@@ -4763,11 +4759,10 @@ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*);
** the compiled regular expression can be reused on multiple
** invocations of the same function.
**
-** ^The sqlite3_get_auxdata(C,N) interface returns a pointer to the metadata
-** associated by the sqlite3_set_auxdata(C,N,P,X) function with the Nth argument
-** value to the application-defined function. ^N is zero for the left-most
-** function argument. ^If there is no metadata
-** associated with the function argument, the sqlite3_get_auxdata(C,N) interface
+** ^The sqlite3_get_auxdata() interface returns a pointer to the metadata
+** associated by the sqlite3_set_auxdata() function with the Nth argument
+** value to the application-defined function. ^If there is no metadata
+** associated with the function argument, this sqlite3_get_auxdata() interface
** returns a NULL pointer.
**
** ^The sqlite3_set_auxdata(C,N,P,X) interface saves P as metadata for the N-th
@@ -4798,10 +4793,6 @@ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*);
** function parameters that are compile-time constants, including literal
** values and [parameters] and expressions composed from the same.)^
**
-** The value of the N parameter to these interfaces should be non-negative.
-** Future enhancements may make use of negative N values to define new
-** kinds of function caching behavior.
-**
** These routines must be called from the same thread in which
** the SQL function is running.
*/
@@ -9396,7 +9387,7 @@ typedef struct sqlite3_changegroup sqlite3_changegroup;
** sqlite3changegroup_output() functions, also available are the streaming
** versions sqlite3changegroup_add_strm() and sqlite3changegroup_output_strm().
*/
-SQLITE_API int sqlite3changegroup_new(sqlite3_changegroup **pp);
+int sqlite3changegroup_new(sqlite3_changegroup **pp);
/*
** CAPI3REF: Add A Changeset To A Changegroup
@@ -9473,7 +9464,7 @@ SQLITE_API int sqlite3changegroup_new(sqlite3_changegroup **pp);
**
** If no error occurs, SQLITE_OK is returned.
*/
-SQLITE_API int sqlite3changegroup_add(sqlite3_changegroup*, int nData, void *pData);
+int sqlite3changegroup_add(sqlite3_changegroup*, int nData, void *pData);
/*
** CAPI3REF: Obtain A Composite Changeset From A Changegroup
@@ -9499,7 +9490,7 @@ SQLITE_API int sqlite3changegroup_add(sqlite3_changegroup*, int nData, void *pDa
** responsibility of the caller to eventually free the buffer using a
** call to sqlite3_free().
*/
-SQLITE_API int sqlite3changegroup_output(
+int sqlite3changegroup_output(
sqlite3_changegroup*,
int *pnData, /* OUT: Size of output buffer in bytes */
void **ppData /* OUT: Pointer to output buffer */
@@ -9508,7 +9499,7 @@ SQLITE_API int sqlite3changegroup_output(
/*
** CAPI3REF: Delete A Changegroup Object
*/
-SQLITE_API void sqlite3changegroup_delete(sqlite3_changegroup*);
+void sqlite3changegroup_delete(sqlite3_changegroup*);
/*
** CAPI3REF: Apply A Changeset To A Database
@@ -9897,11 +9888,11 @@ SQLITE_API int sqlite3session_patchset_strm(
int (*xOutput)(void *pOut, const void *pData, int nData),
void *pOut
);
-SQLITE_API int sqlite3changegroup_add_strm(sqlite3_changegroup*,
+int sqlite3changegroup_add_strm(sqlite3_changegroup*,
int (*xInput)(void *pIn, void *pData, int *pnData),
void *pIn
);
-SQLITE_API int sqlite3changegroup_output_strm(sqlite3_changegroup*,
+int sqlite3changegroup_output_strm(sqlite3_changegroup*,
int (*xOutput)(void *pOut, const void *pData, int nData),
void *pOut
);