From: drh <drh@noemail.net>
Date: Wed, 8 Jul 2015 13:40:50 +0000 (+0000)
Subject: Do not do the bulk pcache1 allocations if SQLITE_CONFIG_PAGECACHE specifies
X-Git-Tag: version-3.8.11~49^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52d9f40b7def9c5fe30b6b4dd5a1f263b17619ae;p=thirdparty%2Fsqlite.git

Do not do the bulk pcache1 allocations if SQLITE_CONFIG_PAGECACHE specifies
a global page cache buffer.

FossilOrigin-Name: 75d98dae676996a05e97b09b19e34463e8f30d51
---

diff --git a/manifest b/manifest
index 77fde56543..d9c3660327 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sleft-shifting\sbits\sinto\sthe\ssign\sof\sa\ssigned\sinteger,\sas\ssuch\sbehavior\nis\stechnically\sundefined.
-D 2015-07-08T01:22:52.331
+C Do\snot\sdo\sthe\sbulk\spcache1\sallocations\sif\sSQLITE_CONFIG_PAGECACHE\sspecifies\na\sglobal\spage\scache\sbuffer.
+D 2015-07-08T13:40:50.550
 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 e3b0de837c9af01335e7e59fa8290dfa9338b2a3
+F src/pcache1.c 1f88fe632a67574e61a4d52f08e21338648c4016
 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 ad5fdfbac85682f0f0dee62e1086f40026a58be2
-R ffdb1dc8cf76fb977c83d0c8ad3dcce5
+P 9417b4021b779876dcb3b9be636f01f4055eb54e
+R dc45b55e45fc287d8da6e081b45bc4d0
 U drh
-Z 1578fd578fb2f64903bdcd3127f0d5d4
+Z 0743262729e38494d19c03648108bfa3
diff --git a/manifest.uuid b/manifest.uuid
index bd9adfaf63..12460e3042 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9417b4021b779876dcb3b9be636f01f4055eb54e
\ No newline at end of file
+75d98dae676996a05e97b09b19e34463e8f30d51
\ No newline at end of file
diff --git a/src/pcache1.c b/src/pcache1.c
index 90989bc1db..ed2700852d 100644
--- a/src/pcache1.c
+++ b/src/pcache1.c
@@ -702,7 +702,10 @@ static sqlite3_pcache *pcache1Create(int szPage, int szExtra, int bPurgeable){
     pcache1LeaveMutex(pGroup);
     /* Try to initialize the local bulk pagecache line allocation if using
     ** separate caches and if nPage!=0 */
-    if( pcache1.separateCache && sqlite3GlobalConfig.nPage!=0 ){
+    if( pcache1.separateCache
+     && sqlite3GlobalConfig.nPage!=0
+     && sqlite3GlobalConfig.pPage==0
+    ){
       int szBulk;
       char *zBulk;
       sqlite3BeginBenignMalloc();