Copy the cache_spill setting from the main database over to the

vacuum_db transient database when running a VACUUM.

FossilOrigin-Name: c0e7d98ef2a13ede5ae865083ede1aaffdf43310

diff --git a/manifest b/manifest
index 287421d1432b5e07917546cc609710c9a69b0f5f..8ca4a9cd2c2871fbde3e056e3e964222f976265a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\saffinity\sis\sapplied\scorrectly\son\slower-bound\srange\sconstraints\nin\sthe\smin()\soptimization.\s\sFix\sfor\sticket\s[a0bac8b3c3d1bb].
-D 2016-07-26T04:31:14.412
+C Copy\sthe\scache_spill\ssetting\sfrom\sthe\smain\sdatabase\sover\sto\sthe\nvacuum_db\stransient\sdatabase\swhen\srunning\sa\sVACUUM.
+D 2016-07-26T04:49:43.617
 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 7949183a9ce2270fc76503384b1159fcb1e39723
+F src/vacuum.c 9dd2f5d276bc6094d8f1d85ecd41b30c1a002a43
 F src/vdbe.c ea260b61e73b11a71e70b28a8e25866e2899e5da
 F src/vdbe.h 67bc551f7faf04c33493892e4b378aada823ed10
 F src/vdbeInt.h c59381049af5c7751a83456c39b80d1a6fde1f9d
@@ -1507,8 +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 b78d99548ac53ac10dcc38368cc4b29c8cbcb09b
-Q +0e9f534fef72ca142a4296ab5285c82aada38ba7
-R b5725dd72810ef0d52d5b0abd989daf2
+P b819bace9c2a0b0159122b26db96a8f50a6f0eac
+R 2279949c9ee671e45067af58637c4ef8
 U drh
-Z a046c0beaad1d7947f30a6bdc44927b5
+Z ef49efbba33d277501e077ba267218c2

diff --git a/manifest.uuid b/manifest.uuid
index 989f1b27cacbcc214fe3a19b0182b688c850f754..59d5af71dfd0b271d2c6968b64616c5acec2eef5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b819bace9c2a0b0159122b26db96a8f50a6f0eac
\ No newline at end of file
+c0e7d98ef2a13ede5ae865083ede1aaffdf43310
\ No newline at end of file

diff --git a/src/vacuum.c b/src/vacuum.c
index 16c4be01c0a49df0c74844b3d39a17617d9fe76d..b72663c066a07f3288bf2eed8769579963f6393f 100644 (file)
--- a/src/vacuum.c
+++ b/src/vacuum.c
@@ -198,6 +198,7 @@ int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){
 #endif
 
   sqlite3BtreeSetCacheSize(pTemp, db->aDb[0].pSchema->cache_size);
+  sqlite3BtreeSetSpillSize(pTemp, sqlite3BtreeSetSpillSize(pMain,0));
   rc = execSql(db, pzErrMsg, "PRAGMA vacuum_db.synchronous=OFF");
   if( rc!=SQLITE_OK ) goto end_of_vacuum;