From: drh <drh@noemail.net>
Date: Fri, 7 Dec 2018 20:40:12 +0000 (+0000)
Subject: Merge the VACUUM simplification from trunk.
X-Git-Tag: version-3.27.0~312^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52993b31e12ce90a43692e59b744d3a5ac05648f;p=thirdparty%2Fsqlite.git

Merge the VACUUM simplification from trunk.

FossilOrigin-Name: 93d92a0a5d21a1856316c0205ecaa253691b6e5349b552d43027005676d14820
---

52993b31e12ce90a43692e59b744d3a5ac05648f
diff --cc manifest
index f3b956e8c9,46031d6ed1..c59fcc0427
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Prototype\simplementation\sfor\sthe\sVACUUM\sINTO\scommand.
- D 2018-12-07T17:28:28.770
 -C Remove\sa\sline\sof\scode\sfrom\sVACUUM\sthat\sis\sno\slonger\sneeded,\sdue\sto\sthe\nchange\sthat\sallows\sATTACH\sto\srun\swithin\sa\stransaction.
 -D 2018-12-07T20:26:29.949
++C Merge\sthe\sVACUUM\ssimplification\sfrom\strunk.
++D 2018-12-07T20:40:12.098
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in 68d0ba0f0b533d5bc84c78c13a6ce84ee81183a67014caa47a969e67f028fa1c
@@@ -577,8 -577,8 +577,8 @@@ F src/update.c 1816d56c1bca1ba4e0ef98ca
  F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
- F src/vacuum.c 76b92b5d6afc83a8f396b59bcc042955bf563f07b6aa60eea3d57f7be5336180
 -F src/vacuum.c b25dbace5b6727cd906441e87857b828eb2377f7b1b2ba3eec36155ce727730c
 -F src/vdbe.c c7312c909df5032b4ed27996c2ed8f5bf948f6a982458f85398520aaba0ccf81
++F src/vacuum.c 7b74a106ecac182900124e7708b3657377a5b2b18812efc31f100caca1c0eae3
 +F src/vdbe.c 872bdd34338548242b36df18c49c90b34689e41c0b4e5c197e83bb82a38ce8dd
  F src/vdbe.h d82f323d581b36b8e147d650257ef34e0e93790039b6cbda45c321c275f7595e
  F src/vdbeInt.h 73f5051923f3f29779bfc374c0c68e23b8e5e3792def2e33e51b427edb890abd
  F src/vdbeapi.c 9709452bee82963e1f7f1f5d0c71db823d553f8dbb2c47a911c4983d537a1947
@@@ -1782,10 -1782,7 +1782,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 0d8e150434bbd179696f1ffe71d1e06cb3d43e6468496c7e481fca8486387bad
- R 319ff574feecdbd7034aa017b5a3dd35
- T *branch * vacuum-into
- T *sym-vacuum-into *
- T -sym-trunk *
 -R 4426cbb4a0e989d65734a42a486b3458
++P 036e3320a4af36c1311b25b2e504b0079c8b33df8ad7b7e5fddad07150e6f87d a92c398fc5df142ff1459c1be4a6832f2219bc7fabe5789535be3bbd41a4269b
++R 5e2deff1e10a62e804983a88b3d403b2
  U drh
- Z 59d199189f2c579663aad138ddb0acd8
 -Z 888d594bf1edeab12c4e75c4f15da299
++Z a260dfd202744b5f58f4cbc1728d27d6
diff --cc manifest.uuid
index 3de4b7164f,5c7c601c94..94144aeb81
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 036e3320a4af36c1311b25b2e504b0079c8b33df8ad7b7e5fddad07150e6f87d
 -a92c398fc5df142ff1459c1be4a6832f2219bc7fabe5789535be3bbd41a4269b
++93d92a0a5d21a1856316c0205ecaa253691b6e5349b552d43027005676d14820