diff options
| author | drh <drh@noemail.net> | 2014-08-06 01:25:47 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-08-06 01:25:47 +0000 |
| commit | 58c4cbe152e39baadd2e9df87013d23f16c20a66 (patch) | |
| tree | 1160ce6260d6901566131cb75e8d3b478aa8b1cb /src/sqlite.h.in | |
| parent | 39a7bfd361768dcd89bcf987c1582daafae19819 (diff) | |
| parent | bc5cf3813ea1bf56ed19a35028061e779827fffc (diff) | |
| download | sqlite-58c4cbe152e39baadd2e9df87013d23f16c20a66.tar.gz sqlite-58c4cbe152e39baadd2e9df87013d23f16c20a66.zip | |
Merge the latest 3.8.6 beta changes from trunk.
FossilOrigin-Name: 68a6d5e2f43702c78057ae2f2a7345c981d24e17
Diffstat (limited to 'src/sqlite.h.in')
| -rw-r--r-- | src/sqlite.h.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 95bd30b2a..1aff683e7 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -5875,10 +5875,12 @@ int sqlite3_vfs_unregister(sqlite3_vfs*); ** <li> SQLITE_MUTEX_RECURSIVE ** <li> SQLITE_MUTEX_STATIC_MASTER ** <li> SQLITE_MUTEX_STATIC_MEM -** <li> SQLITE_MUTEX_STATIC_MEM2 +** <li> SQLITE_MUTEX_STATIC_OPEN ** <li> SQLITE_MUTEX_STATIC_PRNG ** <li> SQLITE_MUTEX_STATIC_LRU -** <li> SQLITE_MUTEX_STATIC_LRU2 +** <li> SQLITE_MUTEX_STATIC_PMEM +** <li> SQLITE_MUTEX_STATIC_APP1 +** <li> SQLITE_MUTEX_STATIC_APP2 ** </ul>)^ ** ** ^The first two constants (SQLITE_MUTEX_FAST and SQLITE_MUTEX_RECURSIVE) @@ -6082,6 +6084,9 @@ int sqlite3_mutex_notheld(sqlite3_mutex*); #define SQLITE_MUTEX_STATIC_LRU 6 /* lru page list */ #define SQLITE_MUTEX_STATIC_LRU2 7 /* NOT USED */ #define SQLITE_MUTEX_STATIC_PMEM 7 /* sqlite3PageMalloc() */ +#define SQLITE_MUTEX_STATIC_APP1 8 /* For use by application */ +#define SQLITE_MUTEX_STATIC_APP2 9 /* For use by application */ +#define SQLITE_MUTEX_STATIC_APP3 10 /* For use by application */ /* ** CAPI3REF: Retrieve the mutex for a database connection |