From: drh <drh@noemail.net>
Date: Mon, 25 Jul 2016 22:46:06 +0000 (+0000)
Subject: Merge the VACCUM cache_size adjustment from trunk.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e89b957efa7b4cbf60e02f433d8c0c9a2304273;p=thirdparty%2Fsqlite.git

Merge the VACCUM cache_size adjustment from trunk.

FossilOrigin-Name: cdb7efd01ed7a8f11681b277098bb3eb12ca39d2
---

9e89b957efa7b4cbf60e02f433d8c0c9a2304273
diff --cc manifest
index 34414ec0d8,e225d5909f..b6e936fdb3
--- a/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Add\sthe\sexperimental\sSQLITE_VACUUM_CACHE_SIZE\smacro.
- D 2016-07-25T18:50:08.352
 -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
++C Merge\sthe\sVACCUM\scache_size\sadjustment\sfrom\strunk.
++D 2016-07-25T22:46:06.502
 +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 d60b11b2fe49759206c25a2a4ee664a1b5087e86
+ F src/vacuum.c 7949183a9ce2270fc76503384b1159fcb1e39723
 -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 e98cefb17d03ca146d0ff42bdd4dd6a8f3ba6735
- R ad6f83cdc56fc57d19067a2ffbb15128
 -P a495f8e77e14241150f79e746c7303284f04621a
 -R 8704dbefb85fb183a067d36d9af66cac
++P 68ecd8e042bd14b8ede69219bd4ed175bf097d0b b78d99548ac53ac10dcc38368cc4b29c8cbcb09b
++R 1a957c8832276cfb650f46ccb586c265
  U drh
- Z 3abcf936a88be3fec3b9c064f792931f
 -Z 422685421478fa78357b95bed0587f82
++Z 806e92a20bb0c43bddc31146ba8412fd
diff --cc manifest.uuid
index 1d84d37806,3c7462248c..2e19bb149e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 68ecd8e042bd14b8ede69219bd4ed175bf097d0b
 -b78d99548ac53ac10dcc38368cc4b29c8cbcb09b
++cdb7efd01ed7a8f11681b277098bb3eb12ca39d2