diff options
| -rw-r--r-- | lib/libsqlite3/shlib_version | 4 | ||||
| -rw-r--r-- | lib/libsqlite3/sqlite3.pc | 2 | ||||
| -rw-r--r-- | lib/libsqlite3/src/sqlite3.h | 25 |
3 files changed, 22 insertions, 9 deletions
diff --git a/lib/libsqlite3/shlib_version b/lib/libsqlite3/shlib_version index d4fd07c5067..1097f06c4be 100644 --- a/lib/libsqlite3/shlib_version +++ b/lib/libsqlite3/shlib_version @@ -1,3 +1,3 @@ -# $OpenBSD: shlib_version,v 1.1 2012/04/14 13:20:28 espie Exp $ +# $OpenBSD: shlib_version,v 1.2 2012/05/22 09:08:05 espie Exp $ major=18 -minor=0 +minor=2 diff --git a/lib/libsqlite3/sqlite3.pc b/lib/libsqlite3/sqlite3.pc index 62dfec5a734..7b8e1aaf3fe 100644 --- a/lib/libsqlite3/sqlite3.pc +++ b/lib/libsqlite3/sqlite3.pc @@ -7,7 +7,7 @@ includedir=${prefix}/include Name: SQLite Description: SQL database engine -Version: 3.7.11 +Version: 3.7.12 Libs: -L${libdir} -lsqlite3 Libs.private: Cflags: -I${includedir} diff --git a/lib/libsqlite3/src/sqlite3.h b/lib/libsqlite3/src/sqlite3.h index aeaa49d6bbd..f6a0eecdd83 100644 --- a/lib/libsqlite3/src/sqlite3.h +++ b/lib/libsqlite3/src/sqlite3.h @@ -103,9 +103,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.7.11" -#define SQLITE_VERSION_NUMBER 3007011 -#define SQLITE_SOURCE_ID "--SOURCE-ID--" +#define SQLITE_VERSION "3.7.12" +#define SQLITE_VERSION_NUMBER 3007012 +#define SQLITE_SOURCE_ID "OpenBSD" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -458,6 +458,7 @@ int sqlite3_exec( #define SQLITE_LOCKED_SHAREDCACHE (SQLITE_LOCKED | (1<<8)) #define SQLITE_BUSY_RECOVERY (SQLITE_BUSY | (1<<8)) #define SQLITE_CANTOPEN_NOTEMPDIR (SQLITE_CANTOPEN | (1<<8)) +#define SQLITE_CANTOPEN_ISDIR (SQLITE_CANTOPEN | (2<<8)) #define SQLITE_CORRUPT_VTAB (SQLITE_CORRUPT | (1<<8)) #define SQLITE_READONLY_RECOVERY (SQLITE_READONLY | (1<<8)) #define SQLITE_READONLY_CANTLOCK (SQLITE_READONLY | (2<<8)) @@ -771,7 +772,7 @@ struct sqlite3_io_methods { ** ** <li>[[SQLITE_FCNTL_PERSIST_WAL]] ** ^The [SQLITE_FCNTL_PERSIST_WAL] opcode is used to set or query the -** persistent [WAL | Write AHead Log] setting. By default, the auxiliary +** persistent [WAL | Write Ahead Log] setting. By default, the auxiliary ** write ahead log and shared memory files used for transaction control ** are automatically deleted when the latest connection to the database ** closes. Setting persistent WAL mode causes those files to persist after @@ -1547,7 +1548,7 @@ struct sqlite3_mem_methods { ** [SQLITE_USE_URI] symbol defined. ** ** [[SQLITE_CONFIG_PCACHE]] [[SQLITE_CONFIG_GETPCACHE]] -** <dt>SQLITE_CONFIG_PCACHE and SQLITE_CONFNIG_GETPCACHE +** <dt>SQLITE_CONFIG_PCACHE and SQLITE_CONFIG_GETPCACHE ** <dd> These options are obsolete and should not be used by new code. ** They are retained for backwards compatibility but are now no-ops. ** </dl> @@ -6006,6 +6007,17 @@ int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int resetFlg); ** occurred.)^ ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_MISS ** is always 0. ** </dd> +** +** [[SQLITE_DBSTATUS_CACHE_WRITE]] ^(<dt>SQLITE_DBSTATUS_CACHE_WRITE</dt> +** <dd>This parameter returns the number of dirty cache entries that have +** been written to disk. Specifically, the number of pages written to the +** wal file in wal mode databases, or the number of pages written to the +** database file in rollback mode databases. Any pages written as part of +** transaction rollback or database recovery operations are not included. +** If an IO or other error occurs while writing a page to disk, the effect +** on subsequent SQLITE_DBSTATUS_CACHE_WRITE requests is undefined.)^ ^The +** highwater mark associated with SQLITE_DBSTATUS_CACHE_WRITE is always 0. +** </dd> ** </dl> */ #define SQLITE_DBSTATUS_LOOKASIDE_USED 0 @@ -6017,7 +6029,8 @@ int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int resetFlg); #define SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL 6 #define SQLITE_DBSTATUS_CACHE_HIT 7 #define SQLITE_DBSTATUS_CACHE_MISS 8 -#define SQLITE_DBSTATUS_MAX 8 /* Largest defined DBSTATUS */ +#define SQLITE_DBSTATUS_CACHE_WRITE 9 +#define SQLITE_DBSTATUS_MAX 9 /* Largest defined DBSTATUS */ /* |