diff options
| author | dan <dan@noemail.net> | 2015-01-01 18:03:49 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2015-01-01 18:03:49 +0000 |
| commit | 37db72f1f7ca41c61b1c084bdb75f3111ceba6f8 (patch) | |
| tree | 5a01dcb28b6513353a64e93b11d6243845e69bc7 /src/mutex.c | |
| parent | 6024772ba292a9abc6810dd0b12767d02b47ccf1 (diff) | |
| parent | a0de826c9ff84bd19de76ebbc0d4bdafa9686d3a (diff) | |
| download | sqlite-37db72f1f7ca41c61b1c084bdb75f3111ceba6f8.tar.gz sqlite-37db72f1f7ca41c61b1c084bdb75f3111ceba6f8.zip | |
Merge latest trunk changes with this branch.
FossilOrigin-Name: 4b3651677e7132c4c45605bc1f216fc08ef31198
Diffstat (limited to 'src/mutex.c')
| -rw-r--r-- | src/mutex.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mutex.c b/src/mutex.c index b567e7c27..2b4503628 100644 --- a/src/mutex.c +++ b/src/mutex.c @@ -81,7 +81,8 @@ 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; + if( id>SQLITE_MUTEX_RECURSIVE && sqlite3MutexInit() ) return 0; #endif return sqlite3GlobalConfig.mutex.xMutexAlloc(id); } |