summaryrefslogtreecommitdiff
path: root/dist/sqlite3.h
diff options
context:
space:
mode:
authorVasu Nori <vnori@google.com>2010-02-26 14:36:43 -0800
committerVasu Nori <vnori@google.com>2010-03-01 10:50:55 -0800
commitcd1b5450506dc71940b94bc7f5a74c1cc29bb7da (patch)
tree6339fe01d8b3e245660d0838013eaa24d190411f /dist/sqlite3.h
parente568ad0c5f7ad9e4a47ce79711692ff1dc145fb6 (diff)
get latest sqlite from froyo branch created by richard hipp @ sqlite
this will remove a lot of android specific code from sqlite in external/sqlite/dist. we are getting closer to using the public domain sqlite. ******* NOTE TO REVIEWERS ********* to compare, don't use gerrit. that will compare this sqlite3.c with the currently-checkin version, showing you the differences between this sqlite version and the previous sqlite version. you may not care about that. if you just need to see what android changes to sqlite are, then compare the following two files in this CL sqlite3.c.orig sqlite3.c
Diffstat (limited to 'dist/sqlite3.h')
-rw-r--r--dist/sqlite3.h18
1 files changed, 15 insertions, 3 deletions
diff --git a/dist/sqlite3.h b/dist/sqlite3.h
index 26c7ade..b971516 100644
--- a/dist/sqlite3.h
+++ b/dist/sqlite3.h
@@ -109,7 +109,7 @@ extern "C" {
*/
#define SQLITE_VERSION "3.6.22"
#define SQLITE_VERSION_NUMBER 3006022
-#define SQLITE_SOURCE_ID "2010-01-05 15:30:36 28d0d7710761114a44a1a3a425a6883c661f06e7"
+#define SQLITE_SOURCE_ID "2010-02-25 14:56:29 b8fbf4275bded6680e368a6a8343866467bd7e22"
/*
** CAPI3REF: Run-Time Library Version Numbers
@@ -918,7 +918,6 @@ SQLITE_API int sqlite3_os_end(void);
/*
** CAPI3REF: Configuring The SQLite Library
-** EXPERIMENTAL
**
** The sqlite3_config() interface is used to make global configuration
** changes to SQLite in order to tune SQLite to the specific needs of
@@ -1259,6 +1258,7 @@ struct sqlite3_mem_methods {
#define SQLITE_CONFIG_LOOKASIDE 13 /* int int */
#define SQLITE_CONFIG_PCACHE 14 /* sqlite3_pcache_methods* */
#define SQLITE_CONFIG_GETPCACHE 15 /* sqlite3_pcache_methods* */
+#define SQLITE_CONFIG_LOG 16 /* xFunc, void* */
/*
** CAPI3REF: Configuration Options
@@ -5647,6 +5647,19 @@ SQLITE_API int sqlite3_unlock_notify(
*/
SQLITE_API int sqlite3_strnicmp(const char *, const char *, int);
+/*
+** CAPI3REF: Error Logging Interface
+** EXPERIMENTAL
+**
+** ^The [sqlite3_log()] interface writes a message into the error log
+** established by the [SQLITE_CONFIG_ERRORLOG] option to [sqlite3_config()].
+**
+** The sqlite3_log() interface is intended for use by extensions such as
+** virtual tables, collating functions, and SQL functions. While there is
+** nothing to prevent an application from calling sqlite3_log(), doing so
+** is considered bad form.
+*/
+SQLITE_API void sqlite3_log(int iErrCode, const char *zFormat, ...);
// Begin Android add
/*
** Android additional API.
@@ -5657,7 +5670,6 @@ SQLITE_API int sqlite3_strnicmp(const char *, const char *, int);
*/
int sqlite3_set_transaction_default_immediate(sqlite3*, int immediate);
// End Android add
-
/*
** Undo the hack that converts floating point types to integer for
** builds on processors without floating point support.