From: drh <drh@noemail.net>
Date: Fri, 19 Aug 2016 15:17:51 +0000 (+0000)
Subject: Merge the VACUUM attached database enhancement from trunk.
X-Git-Tag: version-3.14.2~8^2~3^2~2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05a41ee9ec016640f742deaa4cb5f80f06a39b1e;p=thirdparty%2Fsqlite.git

Merge the VACUUM attached database enhancement from trunk.

FossilOrigin-Name: 12d5e38d269ede27cd38a031a395915301fffe56
---

05a41ee9ec016640f742deaa4cb5f80f06a39b1e
diff --cc manifest
index 3ece311687,2c686caa9b..0c9709e64d
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\sSQLITE_DBCONFIG_MAINDBNAME\sinterface.
- D 2016-08-18T22:44:22.865
 -C Enhance\sthe\sVACUUM\scommand\sso\sthat\sit\scan\soperate\son\san\sattached\sdatabase.
 -D 2016-08-19T15:15:55.612
++C Merge\sthe\sVACUUM\sattached\sdatabase\senhancement\sfrom\strunk.
++D 2016-08-19T15:17:51.033
  F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@@ -346,10 -346,10 +346,10 @@@ F src/global.c c45ea22aff29334f6a9ec549
  F src/hash.c 55b5fb474100cee0b901edaf203e26c970940f36
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
- F src/insert.c d5cd8315c0577e86e17dda9239b45cffa81022c0
+ F src/insert.c a255eb795cf475e7a0659297144fc80f70eb4e30
  F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
  F src/loadext.c dd7a2b77902cc66c22555aef02e1a682554b7aec
 -F src/main.c 8dc7adfeace35ee1f4c489b503ee8fe6bc1fa802
 +F src/main.c 4dba24a78c9797c4005521107905f42217668b86
  F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -386,10 -386,10 +386,10 @@@ F src/resolve.c d67b9a5cc33339256e2088c
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c fda7fd24b4d8e75479ae581329db0a0b0bf76633
  F src/shell.c 79dda477be6c96eba6e952a934957ad36f87acc7
 -F src/sqlite.h.in 0f7580280d1b009b507d8beec1ff0f197ba0cc99
 +F src/sqlite.h.in 4a030e254e204570444b34bf7d40fb4a5416089e
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h f81e279da1bae217d9afcc60d5580a0d4615727e
+ F src/sqliteInt.h 153099746007418dfa03a99c8355c8d47b0a1cc9
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -1510,10 -1511,8 +1511,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 cb9865e14db1c0076618f13400151112f84960cb
- R 2f06ec82e9a3f57e0b8d261a230c1531
- T *branch * dbconfig_maindbname
- T *sym-dbconfig_maindbname *
- T -sym-trunk *
 -P cb9865e14db1c0076618f13400151112f84960cb ad35ef116296e5d6aaeb9ef260bf35bee3bd6d20
 -R abd29f9f3d87c2af53d085425233b2a6
 -T +closed ad35ef116296e5d6aaeb9ef260bf35bee3bd6d20
++P d6e3d5796c9991ca0af45ed92ce36f55efc02348 083f9e6270fa4faa402b91231271da4f3915c79f
++R a6e4b4d3ce0ef3f2cf848bb14d9b8323
  U drh
- Z 8066580a45fc98ac9d9fef6e64c8a3cf
 -Z a6de375e7bb722769082d6e640b9c49b
++Z 52253f5e7188c5e562d511d2d515cb7a
diff --cc manifest.uuid
index c0332cdd38,4e9d48c81e..b09f072000
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d6e3d5796c9991ca0af45ed92ce36f55efc02348
 -083f9e6270fa4faa402b91231271da4f3915c79f
++12d5e38d269ede27cd38a031a395915301fffe56