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/mutex_unix.c | |
| 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/mutex_unix.c')
| -rw-r--r-- | src/mutex_unix.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/mutex_unix.c b/src/mutex_unix.c index eca729583..c8663144e 100644 --- a/src/mutex_unix.c +++ b/src/mutex_unix.c @@ -96,10 +96,13 @@ static int pthreadMutexEnd(void){ return SQLITE_OK; } ** <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_PMEM +** <li> SQLITE_MUTEX_STATIC_APP1 +** <li> SQLITE_MUTEX_STATIC_APP2 +** <li> SQLITE_MUTEX_STATIC_APP3 ** </ul> ** ** The first two constants cause sqlite3_mutex_alloc() to create @@ -133,6 +136,9 @@ static sqlite3_mutex *pthreadMutexAlloc(int iType){ SQLITE3_MUTEX_INITIALIZER, SQLITE3_MUTEX_INITIALIZER, SQLITE3_MUTEX_INITIALIZER, + SQLITE3_MUTEX_INITIALIZER, + SQLITE3_MUTEX_INITIALIZER, + SQLITE3_MUTEX_INITIALIZER, SQLITE3_MUTEX_INITIALIZER }; sqlite3_mutex *p; |