From: drh <drh@noemail.net>
Date: Tue, 7 Jul 2015 15:14:16 +0000 (+0000)
Subject: No need to test sqlite3GlobalConfig.bCoreMutex when SQLITE_THREADSAFE==0.
X-Git-Tag: version-3.8.11~49^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd5ae9649c5293d7f05fe8b6b6038663987ee454;p=thirdparty%2Fsqlite.git

No need to test sqlite3GlobalConfig.bCoreMutex when SQLITE_THREADSAFE==0.

FossilOrigin-Name: 26db0fee06947d75621237a641b9652b312b3b37
---

diff --git a/manifest b/manifest
index bd367c068c..ebdaa318e2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplify\sthe\spage\srecycling\scondition\sin\spcache1.\s\sFix\stest\scases\sto\swork\nwith\sthe\slatest\schanges.
-D 2015-07-07T14:06:18.833
+C No\sneed\sto\stest\ssqlite3GlobalConfig.bCoreMutex\swhen\sSQLITE_THREADSAFE==0.
+D 2015-07-07T15:14:16.002
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 017bf0511d1b2dd1db5e16488fbf75a17b526cbc
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -319,7 +319,7 @@ F src/pager.h 6d435f563b3f7fcae4b84433b76a6ac2730036e2
 F src/parse.y 6d60dda8f8d418b6dc034f1fbccd816c459983a8
 F src/pcache.c cde06aa50962595e412d497e22fd2e07878ba1f0
 F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
-F src/pcache1.c 1b6bc285d8d6a1a7df41e345cb45914093aecfdf
+F src/pcache1.c e3b0de837c9af01335e7e59fa8290dfa9338b2a3
 F src/pragma.c c1f4d012ea9f6b1ce52d341b2cd0ad72d560afd7
 F src/pragma.h b8632d7cdda7b25323fa580e3e558a4f0d4502cc
 F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
@@ -1364,7 +1364,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P d5ff1d69054d51a55eff6e1979971822db7f8f30
-R 968aaca5a1f6e381bde3c0ae75591e74
+P 5b60df5503f61922326b3e10e94aa197b17afe4b
+R 2d7b920ac2e4dfd8e6b212c060ee3e55
 U drh
-Z 609b7f68c8ef0f31b06857cf6a1355d8
+Z 96d25228913b7734acfab488bf16d902
diff --git a/manifest.uuid b/manifest.uuid
index 68d4259bf2..cd9a67d080 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5b60df5503f61922326b3e10e94aa197b17afe4b
\ No newline at end of file
+26db0fee06947d75621237a641b9652b312b3b37
\ No newline at end of file
diff --git a/src/pcache1.c b/src/pcache1.c
index 71c5971c3a..90989bc1db 100644
--- a/src/pcache1.c
+++ b/src/pcache1.c
@@ -633,9 +633,11 @@ static int pcache1Init(void *NotUsed){
   */
 #if defined(SQLITE_ENABLE_MEMORY_MANAGEMENT)
   pcache1.separateCache = 0;
-#else
+#elif SQLITE_THREADSAFE
   pcache1.separateCache = sqlite3GlobalConfig.pPage==0
                           || sqlite3GlobalConfig.bCoreMutex>0;
+#else
+  pcache1.separateCache = sqlite3GlobalConfig.pPage==0;
 #endif
 
 #if SQLITE_THREADSAFE