Add new static mutex SQLITE_MUTEX_STATIC_APP3.

FossilOrigin-Name: ee0ab09c80a648e9202757fc04122952375e7c8c

diff --git a/manifest b/manifest
index 4aa2464bf23b6ff91bc589088a9a24226074f42d..60a99091c5fb8cb70c4bfbef111af3a4cbf9e390 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sstatic\svariable\sdeclaration\sissue\son\sWindows.
-D 2014-05-08T22:01:08.441
+C Add\snew\sstatic\smutex\sSQLITE_MUTEX_STATIC_APP3.
+D 2014-05-09T11:15:57.314
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ad0921c4b2780d01868cf69b419a4f102308d125
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -197,9 +197,9 @@ F src/mem5.c 74670012946c4adc8a6ad84d03acc80959c3e529
 F src/memjournal.c 0683aac6cab6ec2b5374c0db37c0deb2436a3785
 F src/mutex.c 84a073c9a23a8d7bdd2ea832522d1730df18812c
 F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea
-F src/mutex_noop.c 4222773e5f61e506f232aedc9ad9e16ca00c1399
-F src/mutex_unix.c 56e22c1bc6aabfa2f9736317a8f56acd5d0c5f7c
-F src/mutex_w32.c c4726d3bfe80996665a39d27598ebd056e2d6b89
+F src/mutex_noop.c f3f09fd7a2eb4287cfc799753ffc30380e7b71a1
+F src/mutex_unix.c 1b10d5413dfc794364a8adf3eb3a192926b43fa3
+F src/mutex_w32.c 6509b34042b0a8cdd8ea849f5987e187a969f225
 F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
 F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
@@ -220,7 +220,7 @@ F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
 F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
 F src/select.c a5ed3fdc82ebab5b9b095ea1971515a7f8a303d2
 F src/shell.c 6946aea9f21af551fa84bc6b2a8de55d93bf0004
-F src/sqlite.h.in ed6d0cc90da850340c3863c84351e6e164c0ef00
+F src/sqlite.h.in 3f3934dd2ff0adbd79d259fbbb2eee38a2c12367
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 F src/sqliteInt.h 851003126071d4a3bac86a0db75c48197fbd0ff0
@@ -1171,7 +1171,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 7de6aee6a5cb5c7f89dced89f2ebf38f8be7a4fa
-R 117bf7d69b405485b3cb8ed74140d14c
-U mistachkin
-Z 6be3c46bf656f034e9d870a5f4b03d3e
+P a41d29691307067523c8637b486941c5f7c33775
+R dfeb990bf911fd0420714aaa7823f840
+U dan
+Z 6074041396d198afcfcf58f3847bacd2

diff --git a/manifest.uuid b/manifest.uuid
index 80fca0f480bc7c102e071a05afcd5d6290cf529f..a410acecfb4460c7effcb990b1b090913b8c636c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a41d29691307067523c8637b486941c5f7c33775
\ No newline at end of file
+ee0ab09c80a648e9202757fc04122952375e7c8c
\ No newline at end of file

diff --git a/src/mutex_noop.c b/src/mutex_noop.c
index 4cfc6f3a76b114a8194b6eb1cc647c62aea19d96..1a900c225adeea85188f6c9f87a411ac19ad9913 100644 (file)
--- a/src/mutex_noop.c
+++ b/src/mutex_noop.c
@@ -107,7 +107,7 @@ static int debugMutexEnd(void){ return SQLITE_OK; }
 ** that means that a mutex could not be allocated. 
 */
 static sqlite3_mutex *debugMutexAlloc(int id){
-  static sqlite3_debug_mutex aStatic[8];
+  static sqlite3_debug_mutex aStatic[SQLITE_MUTEX_STATIC_APP3 - 1];
   sqlite3_debug_mutex *pNew = 0;
   switch( id ){
     case SQLITE_MUTEX_FAST:

diff --git a/src/mutex_unix.c b/src/mutex_unix.c
index ea1203c047dc3a50d85d22d6a3e50d53ce3fddd9..c8663144e8c55091487fb40d94f370166857c01f 100644 (file)
--- a/src/mutex_unix.c
+++ b/src/mutex_unix.c
@@ -102,6 +102,7 @@ static int pthreadMutexEnd(void){ return SQLITE_OK; }
 ** <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
@@ -137,6 +138,7 @@ static sqlite3_mutex *pthreadMutexAlloc(int iType){
     SQLITE3_MUTEX_INITIALIZER,
     SQLITE3_MUTEX_INITIALIZER,
     SQLITE3_MUTEX_INITIALIZER,
+    SQLITE3_MUTEX_INITIALIZER,
     SQLITE3_MUTEX_INITIALIZER
   };
   sqlite3_mutex *p;

diff --git a/src/mutex_w32.c b/src/mutex_w32.c
index 05d2d5516b0587bc0741e11a34edd1b551dfb024..9a1663e596103b3b8d5cb603abb8961ebd2f76ec 100644 (file)
--- a/src/mutex_w32.c
+++ b/src/mutex_w32.c
@@ -101,6 +101,7 @@ static sqlite3_mutex winMutex_staticMutexes[] = {
   SQLITE3_MUTEX_INITIALIZER,
   SQLITE3_MUTEX_INITIALIZER,
   SQLITE3_MUTEX_INITIALIZER,
+  SQLITE3_MUTEX_INITIALIZER,
   SQLITE3_MUTEX_INITIALIZER
 };
 static int winMutex_isInit = 0;
@@ -167,6 +168,7 @@ static int winMutexEnd(void){
 ** <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

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 2f39101a31e58c037a541e8fce1bd2b5d715ff4f..d3fe5694d815107bc104942ec7edc613696cb784 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -6039,6 +6039,7 @@ int sqlite3_mutex_notheld(sqlite3_mutex*);
 #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