Omit the mutexIsInit test variable when mutexes are disabled.

FossilOrigin-Name: 3ea10434434d27a1300ba2b58e2c47c54909f4ff

diff --git a/manifest b/manifest
index 35e4e36087fac8ef416444b835bde23491bbc110..193d587f609da36d9050c33a9cdb1ddd1bfe74f2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Fixed\ssome\swarnings\sand\san\sassert\sin\sthe\sWINCE\scode\swhen\scompiling\sunder\sMSVC.
-D 2009-09-10T20:23:30
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Omit\sthe\smutexIsInit\stest\svariable\swhen\smutexes\sare\sdisabled.
+D 2009-09-10T22:30:54
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in e360e1214027efbf62cf18ac80ec646d4081c272
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -134,7 +137,7 @@ F src/mem2.c d02bd6a5b34f2d59012a852615621939d9c09548
 F src/mem3.c 67153ec933e08b70714055e872efb58a6b287939
 F src/mem5.c 4837b795ebdecc0cfe1522cd0c8b2c5d84ea490d
 F src/memjournal.c e68cb5f7e828b84d5bf2ea16c5d87f1ed7e9fe7f
-F src/mutex.c 60cd6d854e1c5dbedd9928815c00d63ec24283a9
+F src/mutex.c 525d60fc22922d7a5c44fae147914d64feffb7d0
 F src/mutex.h 9e686e83a88838dac8b9c51271c651e833060f1e
 F src/mutex_noop.c f5a07671f25a1a9bd7c10ad7107bc2585446200f
 F src/mutex_os2.c 6b5a74f812082a8483c3df05b47bbaac2424b9a0
@@ -750,7 +753,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P e9d064bd9318c2bc9248df948f71fd30f24525eb
-R fa073c3be9735e1ddbacea5f24724e02
-U shane
-Z 244ab5dc2c61766a5855c53cce6b3a78
+P f42ec993ac9d42ca31305f26b09924108c36d9f4
+R 3ea2699beae26ad5b007c144fdc59e2d
+U drh
+Z 4b41f9d3c74653a3e3a2a57ba20fb338
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFKqX4ioxKgR168RlERAhR8AJ41xXSlhxWFgE+4152tP+l7d/BFMwCeP8VW
+bwBx8uUK3N5J2wL/7GHguzE=
+=fxQD
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 96bfc373cc395b3574565486bab387d6e87adbc5..fb15f1d390a4473611e77e036ba5654512573e20 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f42ec993ac9d42ca31305f26b09924108c36d9f4
\ No newline at end of file
+3ea10434434d27a1300ba2b58e2c47c54909f4ff
\ No newline at end of file

diff --git a/src/mutex.c b/src/mutex.c
index 6ceb46b070cb879cd220377cea6288ee9b471ee7..c7385158bcaa3552f7ce12fd4dbd4eda8b4ea1aa 100644 (file)
--- a/src/mutex.c
+++ b/src/mutex.c
@@ -18,7 +18,7 @@
 */
 #include "sqliteInt.h"
 
-#ifdef SQLITE_DEBUG
+#if defined(SQLITE_DEBUG) && !defined(SQLITE_MUTEX_OMIT)
 /*
 ** For debugging purposes, record when the mutex subsystem is initialized
 ** and uninitialized so that we can assert() if there is an attempt to