Make sure the sqlite3_mutex.id field is initialized in the Win32

mutex implementation, even when SQLITE_DEBUG is turned off.

FossilOrigin-Name: 6d132e7a224ee68b5cefe9222944aac5760ffc20

diff --git a/manifest b/manifest
index d67728f0c0459af6d478a79ca848ecb8a2610e24..e6e5711336ae9d805a0c536a6cda17b8a9de76e4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssupport\sfor\sthe\slinenoise\scommand-line\sediting\slibrary\sin\sshell.c.
-D 2015-02-25T13:48:10.884
+C Make\ssure\sthe\ssqlite3_mutex.id\sfield\sis\sinitialized\sin\sthe\sWin32\nmutex\simplementation,\seven\swhen\sSQLITE_DEBUG\sis\sturned\soff.
+D 2015-02-25T14:25:31.047
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -208,7 +208,7 @@ F src/mutex.c 19bf9acba69ca2f367c3761080f8a9f0cf4670a8
 F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
 F src/mutex_noop.c 529bab0743c3321c940f32c3464de494fd38cfa9
 F src/mutex_unix.c 5cf676464bd19e0a866297515d146e8bf1669dfb
-F src/mutex_w32.c a6f0b84068db2cbd96a94f23c622aeb875c57dff
+F src/mutex_w32.c 61660ada28d8308ad190f444c2170c4f2a590c2f
 F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
 F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
 F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
@@ -1239,8 +1239,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 034c16bd24ddca363946a4b8751418469d890d2a f7f2598c376a27a86acc21578779c03d0016cd30
-R 39a5a9d65bc63648e34cb80c3dc9dec4
-T +closed f7f2598c376a27a86acc21578779c03d0016cd30
+P 03bbb947192b0c28d960604eae12e5fc2fa6e74e
+R 0ad5cee8f09a4692c3924d804df85893
 U drh
-Z c8318c1240f80cb8fe06db610b0ca5b1
+Z 3ea920f4ffaac12fb90626f34318b0eb

diff --git a/manifest.uuid b/manifest.uuid
index acb199a50a1c83513710469f4e4f2f8c1a7dd965..cc37c0191d72f344c252acd5c92942592fbe75d4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-03bbb947192b0c28d960604eae12e5fc2fa6e74e
\ No newline at end of file
+6d132e7a224ee68b5cefe9222944aac5760ffc20
\ No newline at end of file

diff --git a/src/mutex_w32.c b/src/mutex_w32.c
index 284355f57861b09bd39a2167792914f8a5adaa45..6786614d8e8dab4fd4a5ecc2c396fb2a5380a347 100644 (file)
--- a/src/mutex_w32.c
+++ b/src/mutex_w32.c
@@ -194,8 +194,8 @@ static sqlite3_mutex *winMutexAlloc(int iType){
     case SQLITE_MUTEX_RECURSIVE: {
       p = sqlite3MallocZero( sizeof(*p) );
       if( p ){
-#ifdef SQLITE_DEBUG
         p->id = iType;
+#ifdef SQLITE_DEBUG
 #ifdef SQLITE_WIN32_MUTEX_TRACE_DYNAMIC
         p->trace = 1;
 #endif
@@ -216,8 +216,8 @@ static sqlite3_mutex *winMutexAlloc(int iType){
       }
 #endif
       p = &winMutex_staticMutexes[iType-2];
-#ifdef SQLITE_DEBUG
       p->id = iType;
+#ifdef SQLITE_DEBUG
 #ifdef SQLITE_WIN32_MUTEX_TRACE_STATIC
       p->trace = 1;
 #endif