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.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.c')
| -rw-r--r-- | src/mutex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mutex.c b/src/mutex.c index b567e7c27..bad5a7c11 100644 --- a/src/mutex.c +++ b/src/mutex.c @@ -81,7 +81,7 @@ int sqlite3MutexEnd(void){ */ sqlite3_mutex *sqlite3_mutex_alloc(int id){ #ifndef SQLITE_OMIT_AUTOINIT - if( sqlite3_initialize() ) return 0; + if( id<=SQLITE_MUTEX_RECURSIVE && sqlite3_initialize() ) return 0; #endif return sqlite3GlobalConfig.mutex.xMutexAlloc(id); } |