From: mistachkin <mistachkin@noemail.net>
Date: Mon, 27 Oct 2014 22:06:21 +0000 (+0000)
Subject: Add special handling for static mutexes in sqlite3_mutex_alloc() when automatic calls... 
X-Git-Tag: version-3.8.8~214
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d8ad51c5b53644aa40ab276a7c7342da920d465;p=thirdparty%2Fsqlite.git

Add special handling for static mutexes in sqlite3_mutex_alloc() when automatic calls to sqlite3_initialize() are enabled.

FossilOrigin-Name: 7857d27caa845e5629d94c2e66587dc89016daca
---

diff --git a/manifest b/manifest
index 31157b57d0..ed6b523e7c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\ssmall\samount\sof\sunnecessary\s#ifdeffery\sfrom\srandom.c.
-D 2014-10-27T20:14:02.021
+C Add\sspecial\shandling\sfor\sstatic\smutexes\sin\ssqlite3_mutex_alloc()\swhen\sautomatic\scalls\sto\ssqlite3_initialize()\sare\senabled.
+D 2014-10-27T22:06:21.571
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -202,7 +202,7 @@ F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
 F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
 F src/mem5.c 61eeb90134f9a5be6c2e68d8daae7628b25953fb
 F src/memjournal.c 3eb2c0b51adbd869cb6a44780323f05fa904dc85
-F src/mutex.c 84a073c9a23a8d7bdd2ea832522d1730df18812c
+F src/mutex.c 19bf9acba69ca2f367c3761080f8a9f0cf4670a8
 F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
 F src/mutex_noop.c f3f09fd7a2eb4287cfc799753ffc30380e7b71a1
 F src/mutex_unix.c 551e2f25f0fa0ee8fd7a43f50fc3d8be00e95dde
@@ -1207,7 +1207,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 9588b345d09daaa49d24d7fb6cab732e64e5474e
-R e26f0edef3def3003fae07f43e971e87
-U drh
-Z 3e6e6f10ca8455ff968ead5f51a9fff2
+P 2b9340c8684bc382391e02813e960b3166f24daa
+R f7a6b10545dea42b1d622484e6364982
+U mistachkin
+Z 6b079baac5628ec298fadd129a245092
diff --git a/manifest.uuid b/manifest.uuid
index 11afc870ef..7088378432 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2b9340c8684bc382391e02813e960b3166f24daa
\ No newline at end of file
+7857d27caa845e5629d94c2e66587dc89016daca
\ No newline at end of file
diff --git a/src/mutex.c b/src/mutex.c
index bad5a7c113..2b45036289 100644
--- a/src/mutex.c
+++ b/src/mutex.c
@@ -82,6 +82,7 @@ int sqlite3MutexEnd(void){
 sqlite3_mutex *sqlite3_mutex_alloc(int id){
 #ifndef SQLITE_OMIT_AUTOINIT
   if( id<=SQLITE_MUTEX_RECURSIVE && sqlite3_initialize() ) return 0;
+  if( id>SQLITE_MUTEX_RECURSIVE && sqlite3MutexInit() ) return 0;
 #endif
   return sqlite3GlobalConfig.mutex.xMutexAlloc(id);
 }