From: drh <drh@noemail.net>
Date: Tue, 26 Jul 2016 04:54:54 +0000 (+0000)
Subject: Merge the cache_spill VACUUM fix from trunk.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f7087211c2e1eb2cdf75aa23b3edad8f886843a;p=thirdparty%2Fsqlite.git

Merge the cache_spill VACUUM fix from trunk.

FossilOrigin-Name: cc6bfdf814d5701591b69ba2d399d4a1f6f6cc98
---

6f7087211c2e1eb2cdf75aa23b3edad8f886843a
diff --cc manifest
index a791d39a29,8ca4a9cd2c..4703bf72e8
--- a/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- 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:23:55.718
 -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
++C Merge\sthe\scache_spill\sVACUUM\sfix\sfrom\strunk.
++D 2016-07-26T04:54:54.660
 +F Makefile.in 7ac1f34182d307765c6439c899bd3dac2af587bf
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -452,11 -448,11 +452,11 @@@ F src/trigger.c e14840ee0c3e549e758ec9b
  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.c 5260025793f47c1c51c04154f9762ef3ef310607
  F src/vdbe.h 67bc551f7faf04c33493892e4b378aada823ed10
  F src/vdbeInt.h c59381049af5c7751a83456c39b80d1a6fde1f9d
 -F src/vdbeapi.c c3f6715a99995c11748ecad91d25e93fd9fc390b
 +F src/vdbeapi.c facd9075897e1878446e76680b0519cc6ba199f2
  F src/vdbeaux.c a32d79aeaa88dc2b97c261172d952d395254a055
  F src/vdbeblob.c 83d2d266383157b02e2b809350bb197e89d7895b
  F src/vdbemem.c 1ecaa5ee0caff07255f25d04e8dc88befb6f88d1
@@@ -1512,7 -1507,7 +1512,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P cdb7efd01ed7a8f11681b277098bb3eb12ca39d2
- R 74ba2d4546e92d4ce22c44593dc8a39b
 -P b819bace9c2a0b0159122b26db96a8f50a6f0eac
 -R 2279949c9ee671e45067af58637c4ef8
++P 0e9f534fef72ca142a4296ab5285c82aada38ba7 c0e7d98ef2a13ede5ae865083ede1aaffdf43310
++R ad16072200ab87989c8c158553871b49
  U drh
- Z 23277ec96e3d0ab95dacb520e2474cff
 -Z ef49efbba33d277501e077ba267218c2
++Z fa17d6f6d751fa9f56d6e973bdf235ba
diff --cc manifest.uuid
index c0fdbc599c,59d5af71df..d764d9c2c8
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0e9f534fef72ca142a4296ab5285c82aada38ba7
 -c0e7d98ef2a13ede5ae865083ede1aaffdf43310
++cc6bfdf814d5701591b69ba2d399d4a1f6f6cc98