Cleanup the vacuum bug fixes in version 2.8. (CVS 2327)

FossilOrigin-Name: 5658da7e5ae2ee4dc7ec45a1914f766dfb4be323

diff --git a/manifest b/manifest
index 15bef5c53c7bb963ce75bed0de624158c169d7ef..f2d17b207b29eb40d6fba3cb5416d242e7588738 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\svacuum\sbug\sin\sversion\s2.8.\s\sAlso\sprepare\sfor\srelease\s2.8.16.\s(CVS\s2326)
-D 2005-02-14T00:21:39
+C Cleanup\sthe\svacuum\sbug\sfixes\sin\sversion\s2.8.\s(CVS\s2327)
+D 2005-02-14T00:25:48
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -60,7 +60,7 @@ F src/tokenize.c 6676b946fd8825b67ab52140af4fdc57a70bda48
 F src/trigger.c a9927b57c865b6f3df3fb5e40c9824d722660ded
 F src/update.c bd391079138e67d09c9af34528ca4137c29242d1
 F src/util.c 48f1e99803e924433477a7ccbdab35663acb621d
-F src/vacuum.c 9a59796f3d8303e19ea7acfac26f13221ecf9411
+F src/vacuum.c 12de02a8dec2b3f8d30ea496b66a0f989322a2c4
 F src/vdbe.c f78a26f5bbd647fac84c26e0a54b85361613a004
 F src/vdbe.h ac987945e4dd6f987bca534c6005899f089fc270
 F src/vdbeInt.h b40ff02ce39fd076e6ff3369e19c1bbfe1986682
@@ -191,7 +191,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 0f444c032dded0ea4c5bf47516f37cbd44767689
-R 815998f5923df7cdf378ba921e528786
+P 0eaebad5a0242bbdc9c205bf9efeda93bb0a2de9
+R ae89b6bc94ac5a31cab0377e313efc19
 U drh
-Z ad934a75e14adf4c31565d94ad77114b
+Z e923c62761876756bf9cb0fcca2b41af

diff --git a/manifest.uuid b/manifest.uuid
index 1eb497d8a344fbc9432230ca1d9f1874c369c1a3..1ae9eadbede3410fdc9abb4b17f94dec4b20a3c3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0eaebad5a0242bbdc9c205bf9efeda93bb0a2de9
\ No newline at end of file
+5658da7e5ae2ee4dc7ec45a1914f766dfb4be323
\ No newline at end of file

diff --git a/src/vacuum.c b/src/vacuum.c
index 5dda0dc8acd5a603230f1532dffa13cb58a43ef8..3275e6c522d83d7dc047a0b13971282f9784856e 100644 (file)
--- a/src/vacuum.c
+++ b/src/vacuum.c
@@ -14,7 +14,7 @@
 ** Most of the code in this file may be omitted by defining the
 ** SQLITE_OMIT_VACUUM macro.
 **
-** $Id: vacuum.c,v 1.13.2.4 2005/02/14 00:21:39 drh Exp $
+** $Id: vacuum.c,v 1.13.2.5 2005/02/14 00:25:48 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -163,24 +163,6 @@ static int vacuumCallback1(void *pArg, int argc, char **argv, char **NotUsed){
   return rc;
 }
 
-/*
-** This callback is used to transfer PRAGMA settings from one database
-** to the other.  The value in argv[0] should be passed to a pragma
-** identified by ((vacuumStruct*)pArg)->zPragma.
-*/
-static int vacuumCallback3(void *pArg, int argc, char **argv, char **NotUsed){
-  vacuumStruct *p = (vacuumStruct*)pArg;
-  char zBuf[200];
-  assert( argc==1 );
-  if( argv==0 ) return 0;
-  assert( argv[0]!=0 );
-  assert( strlen(p->zPragma)<100 );
-  assert( strlen(argv[0])<30 );
-  sprintf(zBuf,"PRAGMA %s=%s;", p->zPragma, argv[0]);
-  p->rc = execsql(p->pzErrMsg, p->dbNew, zBuf);
-  return p->rc;
-}
-
 /*
 ** Generate a random name of 20 character in length.
 */
@@ -296,8 +278,6 @@ int sqliteRunVacuum(char **pzErrMsg, sqlite *db){
     rc = sqliteBtreeUpdateMeta(dbNew->aDb[0].pBt, meta2);
   }
   if( rc==SQLITE_OK ){
-    int meta[SQLITE_N_BTREE_META];
-    
     rc = sqliteBtreeCopyFile(db->aDb[0].pBt, dbNew->aDb[0].pBt);
     sqlite_exec(db, "COMMIT", 0, 0, 0);
     sqliteResetInternalSchema(db, 0);