Prevent pagesize changes on VACUUM in encrypted databases even when running

the VACUUM on an attached database.

FossilOrigin-Name: 11693849342a308ad929e2d9ead67faabacb523af76128c6973ed6cc8b62c11e

diff --git a/manifest b/manifest
index 52563b2b9871f8e84d5774f3808dd6cfb3f0c655..6554d8d87071a500185090de60ebb22f6e2e0fee 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\sthe\s"shell_add_schema()"\sSQL\sfunction\sused\sby\sthe\s".schema"\scommand\nof\sthe\scommand-line\sshell\sto\sa\sdifferent\sspot\sin\sthe\sshell.c\ssource\sfile\nso\sthat\sit\sis\snot\sin\sthe\smiddle\sof\san\sunrelated\smodule.
-D 2017-06-15T16:56:05.134
+C Prevent\spagesize\schanges\son\sVACUUM\sin\sencrypted\sdatabases\seven\swhen\srunning\nthe\sVACUUM\son\san\sattached\sdatabase.
+D 2017-06-16T13:43:37.982
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@ -471,7 +471,7 @@ F src/trigger.c d1cae560bfacc8bfb3a072d73658245c1714c0389097da69b4cb23877a082d7e
 F src/update.c c443935c652af9365e033f756550b5032d02e1b06eb2cb890ed7511ae0c051dc
 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
 F src/util.c fc081ec6f63448dcd80d3dfad35baecfa104823254a815b081a4d9fe76e1db23
-F src/vacuum.c 1fe4555cd8c9b263afb85b5b4ee3a4a4181ad569
+F src/vacuum.c 874c0f2f15ab2908748297d587d22d485ea96d55aaec91d4775dddb2e24d2ecf
 F src/vdbe.c 6783778df820f3e0c68289fe5d12ddd34168b0eb1acf248668fec6e2ea1012d5
 F src/vdbe.h 70a409d171d4e51b962f0d53abf15c33c404c6aa4c9d62fb3a931b5a62ba9615
 F src/vdbeInt.h cdcdabad4f5d6bf7a3beb826a7f33ee6f8f1cb220042bedd5b7d4bf2ea1d179f
@@ -1582,7 +1582,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 ca1ff70780e07e5ee930fe7972db02e887d9b085d8ab78e878d7f966b6d684d4
-R 726cc59902873bb7eaa232bba10d7407
+P 254617a1ccfa1736d4e53d670d80319c79c4d93ebf1de69d89ebdba3949bc270
+R 2fae9403d6a69bdf81964eef17b517dd
 U drh
-Z 1749d6289173114f89482a05c36735c7
+Z 67d8e34c53b15ad85020fb42b5ae1f85

diff --git a/manifest.uuid b/manifest.uuid
index 5621a335b60ccb7ca7f7a8d124a6ecbe393395af..f34136b989935915ea857216ece9078a62535a4d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-254617a1ccfa1736d4e53d670d80319c79c4d93ebf1de69d89ebdba3949bc270
\ No newline at end of file
+11693849342a308ad929e2d9ead67faabacb523af76128c6973ed6cc8b62c11e
\ No newline at end of file

diff --git a/src/vacuum.c b/src/vacuum.c
index 9e471b8d9ca6d39b3cb6252898797c9f3b45111e..841aa52009f11942b233df69657dee3307b950ed 100644 (file)
--- a/src/vacuum.c
+++ b/src/vacuum.c
@@ -201,7 +201,7 @@ int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db, int iDb){
     extern void sqlite3CodecGetKey(sqlite3*, int, void**, int*);
     int nKey;
     char *zKey;
-    sqlite3CodecGetKey(db, 0, (void**)&zKey, &nKey);
+    sqlite3CodecGetKey(db, iDb, (void**)&zKey, &nKey);
     if( nKey ) db->nextPagesize = 0;
   }
 #endif