diff options
| author | Vasu Nori <vnori@google.com> | 2010-03-23 10:49:56 -0700 |
|---|---|---|
| committer | Vasu Nori <vnori@google.com> | 2010-03-23 10:49:56 -0700 |
| commit | ebcc71fd53ce7cf46aff607df2d4bff793837176 (patch) | |
| tree | 8dec0c25d34d75a1d1e330ba3a394795498b9192 /dist/sqlite3.h | |
| parent | 31089e078a4ef00cf4903b283d7f06c1a3af83ed (diff) | |
apply couple of bug fixes from sqlite
applying the following bug fixes
http://www.sqlite.org/src/info/82dd61fccf
Sync the database file after a rollback
http://www.sqlite.org/src/info/6f368b5448
Modify the sqlite3_log() interface and implementation so that it never
uses dynamic memory allocation - to avoid deadlocking when called
while holding the memory allocator mutex.
Change-Id: I93929d2dacd399ae9bd291404bcdf2c512691254
Diffstat (limited to 'dist/sqlite3.h')
| -rw-r--r-- | dist/sqlite3.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/dist/sqlite3.h b/dist/sqlite3.h index 9e5c6e7..a275b00 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-03-03 00:02:58 e5342234357dcfde33fb7589f87d64f6de7d9970" +#define SQLITE_SOURCE_ID "2010-03-22 23:55:10 82dd61fccff3e4c77e060e5734cd4b4e2eeb7c32" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -5658,8 +5658,15 @@ SQLITE_API int sqlite3_strnicmp(const char *, const char *, int); ** 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. +** +** To avoid deadlocks and other threading problems, the sqlite3_log() routine +** will not use dynamically allocated memory. The log message is stored in +** a fixed-length buffer on the stack. If the log message is longer than +** a few hundred characters, it will be truncated to the length of the +** buffer. */ SQLITE_API void sqlite3_log(int iErrCode, const char *zFormat, ...); + // Begin Android add /* ** Android additional API. |