Fix the sqlite3_release_memory() interface so that it works even if

SQLITE_DEFAULT_PCACHE_INITSZ is non-zero.

FossilOrigin-Name: 5d902b7fea3144bf57f02aca87b9795fdcec4774310ade6ef01f37d206c3d74f

diff --git a/manifest b/manifest
index 65dae1b276ef434f3877f292ef3099a17c6c12ce..54f5ea0353491046bac9ab3a64a22c45c6739822 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\snew\ssqlite3_set_last_insert_rowid()\sinterface\sto\sthe\sextension\nloader\sthunk.
-D 2017-03-25T19:16:41.259
+C Fix\sthe\ssqlite3_release_memory()\sinterface\sso\sthat\sit\sworks\seven\sif\nSQLITE_DEFAULT_PCACHE_INITSZ\sis\snon-zero.
+D 2017-03-29T15:18:40.905
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 1faf9f06aadc9284c212dea7bbc7c0dea7e8337f0287c81001eff500912c790a
@@ -393,7 +393,7 @@ F src/pager.h f2a99646c5533ffe11afa43e9e0bea74054e4efa
 F src/parse.y 48b03113704ee8bd78ee6996d81de7fbee22e105
 F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
 F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
-F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
+F src/pcache1.c 7eaf916c98e8201aba67a907bbd122a1e476049156e1f507b00d4fd8b730eea7
 F src/pragma.c 2b244434e76c7075edbcfd9e4d634899af0944ff01183b126d4671f7407c2368
 F src/pragma.h c9c763958fec92b04125571472c9500b351c5f7f
 F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
@@ -1569,7 +1569,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 55df410b2cd27dc4c7670bcc1196fa3a0e9e601fc24c42e53d6b0a26ee3e4b45
-R e1b145e92e118b2bc2de7100fb7561b5
+P 8469fc0d48d6af0accef9b8a84e08ad2ca32351907510d177b4ca4815c1ea7cb
+R 723c73ce75ba5d602a30ca6a02a92d57
 U drh
-Z e401f4d2ca1590406e5405bb5cd2850e
+Z 0cd616785f0e67ca6b1ab11d9b71f146

diff --git a/manifest.uuid b/manifest.uuid
index 6ed302dbe3e73c28f879b235da6aa7d57ef230eb..55ed560015576198f13c1cdc2ace4384b0f17f0d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8469fc0d48d6af0accef9b8a84e08ad2ca32351907510d177b4ca4815c1ea7cb
\ No newline at end of file
+5d902b7fea3144bf57f02aca87b9795fdcec4774310ade6ef01f37d206c3d74f
\ No newline at end of file

diff --git a/src/pcache1.c b/src/pcache1.c
index 110d7ec656ae272f777badc74a76b35fd2764408..94f7a87714b265c7c3767614fff61d0dd3994df6 100644 (file)
--- a/src/pcache1.c
+++ b/src/pcache1.c
@@ -1211,7 +1211,7 @@ int sqlite3PcacheReleaseMemory(int nReq){
   int nFree = 0;
   assert( sqlite3_mutex_notheld(pcache1.grp.mutex) );
   assert( sqlite3_mutex_notheld(pcache1.mutex) );
-  if( sqlite3GlobalConfig.nPage==0 ){
+  if( sqlite3GlobalConfig.pPage==0 ){
     PgHdr1 *p;
     pcache1EnterMutex(&pcache1.grp);
     while( (nReq<0 || nFree<nReq)