diff --git a/manifest b/manifest index f3b956e8c9..c59fcc0427 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Prototype\simplementation\sfor\sthe\sVACUUM\sINTO\scommand. -D 2018-12-07T17:28:28.770 +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,7 +577,7 @@ F src/update.c 1816d56c1bca1ba4e0ef98cac2f49be62858e9df1dc08844c7067eb41cc44274 F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4 F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5 F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157 -F src/vacuum.c 76b92b5d6afc83a8f396b59bcc042955bf563f07b6aa60eea3d57f7be5336180 +F src/vacuum.c 7b74a106ecac182900124e7708b3657377a5b2b18812efc31f100caca1c0eae3 F src/vdbe.c 872bdd34338548242b36df18c49c90b34689e41c0b4e5c197e83bb82a38ce8dd F src/vdbe.h d82f323d581b36b8e147d650257ef34e0e93790039b6cbda45c321c275f7595e F src/vdbeInt.h 73f5051923f3f29779bfc374c0c68e23b8e5e3792def2e33e51b427edb890abd @@ -1782,10 +1782,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 0d8e150434bbd179696f1ffe71d1e06cb3d43e6468496c7e481fca8486387bad -R 319ff574feecdbd7034aa017b5a3dd35 -T *branch * vacuum-into -T *sym-vacuum-into * -T -sym-trunk * +P 036e3320a4af36c1311b25b2e504b0079c8b33df8ad7b7e5fddad07150e6f87d a92c398fc5df142ff1459c1be4a6832f2219bc7fabe5789535be3bbd41a4269b +R 5e2deff1e10a62e804983a88b3d403b2 U drh -Z 59d199189f2c579663aad138ddb0acd8 +Z a260dfd202744b5f58f4cbc1728d27d6 diff --git a/manifest.uuid b/manifest.uuid index 3de4b7164f..94144aeb81 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -036e3320a4af36c1311b25b2e504b0079c8b33df8ad7b7e5fddad07150e6f87d \ No newline at end of file +93d92a0a5d21a1856316c0205ecaa253691b6e5349b552d43027005676d14820 \ No newline at end of file diff --git a/src/vacuum.c b/src/vacuum.c index 04958ab53f..4f4fcf410c 100644 --- a/src/vacuum.c +++ b/src/vacuum.c @@ -200,13 +200,6 @@ int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db, int iDb, const char *zOut){ pDb = &db->aDb[nDb]; assert( strcmp(pDb->zDbSName,"vacuum_db")==0 ); pTemp = pDb->pBt; - - /* The call to execSql() to attach the temp database has left the file - ** locked (as there was more than one active statement when the transaction - ** to read the schema was concluded. Unlock it here so that this doesn't - ** cause problems for the call to BtreeSetPageSize() below. */ - sqlite3BtreeCommit(pTemp); - nRes = sqlite3BtreeGetOptimalReserve(pMain); /* A VACUUM cannot change the pagesize of an encrypted database. */