From: drh <drh@noemail.net>
Date: Mon, 25 Jul 2016 22:40:12 +0000 (+0000)
Subject: In the VACUUM command, set the cache_size of the transient vacuum_db database
X-Git-Tag: version-3.14.0~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b62b5def80c984918d197631723ea583a215efb;p=thirdparty%2Fsqlite.git

In the VACUUM command, set the cache_size of the transient vacuum_db database
to be the same as the database being vacuumed.

FossilOrigin-Name: b78d99548ac53ac10dcc38368cc4b29c8cbcb09b
---

diff --git a/manifest b/manifest
index e46a5f0762..e225d5909f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stest\scase\sin\sFTS5\sto\smake\sit\scompatible\swith\sTcl\s8.5.
-D 2016-07-25T21:11:53.996
+C In\sthe\sVACUUM\scommand,\sset\sthe\scache_size\sof\sthe\stransient\svacuum_db\sdatabase\nto\sbe\sthe\ssame\sas\sthe\sdatabase\sbeing\svacuumed.
+D 2016-07-25T22:40:12.561
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -448,7 +448,7 @@ F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
 F src/update.c 4f05ea8cddfa367d045e03589756c02199e8f9bd
 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
 F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
-F src/vacuum.c 544ec90a66a4b0460b7c1baeadbc21b45e6ca0b6
+F src/vacuum.c 7949183a9ce2270fc76503384b1159fcb1e39723
 F src/vdbe.c ea260b61e73b11a71e70b28a8e25866e2899e5da
 F src/vdbe.h 67bc551f7faf04c33493892e4b378aada823ed10
 F src/vdbeInt.h c59381049af5c7751a83456c39b80d1a6fde1f9d
@@ -1507,7 +1507,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 8dcb9d506b5eef3a21d97877217e0df69966a915
-R 39b75cd52198f904a29885025a5d8665
+P a495f8e77e14241150f79e746c7303284f04621a
+R 8704dbefb85fb183a067d36d9af66cac
 U drh
-Z ed1d5b465897ee96bacfa15f366335db
+Z 422685421478fa78357b95bed0587f82
diff --git a/manifest.uuid b/manifest.uuid
index 9a340b022c..3c7462248c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a495f8e77e14241150f79e746c7303284f04621a
\ No newline at end of file
+b78d99548ac53ac10dcc38368cc4b29c8cbcb09b
\ No newline at end of file
diff --git a/src/vacuum.c b/src/vacuum.c
index 9ab7f766ee..16c4be01c0 100644
--- a/src/vacuum.c
+++ b/src/vacuum.c
@@ -197,6 +197,7 @@ int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){
   }
 #endif
 
+  sqlite3BtreeSetCacheSize(pTemp, db->aDb[0].pSchema->cache_size);
   rc = execSql(db, pzErrMsg, "PRAGMA vacuum_db.synchronous=OFF");
   if( rc!=SQLITE_OK ) goto end_of_vacuum;