Fix a #ifdefs that are used to comment-out the VACUUM command. (CVS 970)

FossilOrigin-Name: 22d5324073a727627d4294870a441fa2316fb049

diff --git a/manifest b/manifest
index 16953c91394a6b16546aa49213313d6c998b9b3c..5ba3d82f08667bb7f2f03b5845f9e14cb0acc366 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\shash\sfunctions\salways\sreturn\snon-negative.\s(CVS\s969)
-D 2003-05-12T23:06:53
+C Fix\sa\s#ifdefs\sthat\sare\sused\sto\scomment-out\sthe\sVACUUM\scommand.\s(CVS\s970)
+D 2003-05-13T00:21:59
 F Makefile.in 004acec253ecdde985c8ecd5b7c9accdb210378f
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -58,7 +58,7 @@ F src/tokenize.c 2ba93fe10d5f57f0cc20b07417c3244a30c324b3
 F src/trigger.c 8ee811986080de60d9d883ad96daffea82014f27
 F src/update.c dc3b680b4cf2cb6d839950b68d632850746639b9
 F src/util.c 8065b78806a5132119452d9e0417cf071e6f02f9
-F src/vacuum.c 14ac3073203fa021e01ffe33db56968ad79a8344
+F src/vacuum.c 0820984615786c9ccdaad8032a792309b354a8eb
 F src/vdbe.c e9e560b0c568fb4ffb189d3e0d91628a33d2a367
 F src/vdbe.h 985c24f312d10f9ef8f9a8b8ea62fcdf68e82f21
 F src/where.c ef11773a07cf075740378d7d1cbabf328146fdc9
@@ -165,7 +165,7 @@ F www/speed.tcl cb4c10a722614aea76d2c51f32ee43400d5951be
 F www/sqlite.tcl 4bd1729e320f5fa9125f0022b281fbe839192125
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 3da10d2d02e331f136fcf857dc4c435c67ee7196
-R 4e32f2787678262cce8381eeed283f3f
+P 39a3e403f0440acb2f85a064ec23d404f9cdfbc4
+R 7306809a4e8852d48a70b3ad0f0f7bc9
 U drh
-Z 9359b7aa0886849f400e188f1dbf3d43
+Z 964a58c640b88c89eec4f9710b117e21

diff --git a/manifest.uuid b/manifest.uuid
index 74c66123148a9d639b89281693fda68bbec64de7..7efcccea934e8bacc5492253fa6cf4c1ddaabe6d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-39a3e403f0440acb2f85a064ec23d404f9cdfbc4
\ No newline at end of file
+22d5324073a727627d4294870a441fa2316fb049
\ No newline at end of file

diff --git a/src/vacuum.c b/src/vacuum.c
index 50c7e88eff03066dcc934d2913ce55862620762c..afa1e263b30684353937f51a0dd74028f886a627 100644 (file)
--- a/src/vacuum.c
+++ b/src/vacuum.c
@@ -14,13 +14,11 @@
 ** Most of the code in this file may be omitted by defining the
 ** SQLITE_OMIT_VACUUM macro.
 **
-** $Id: vacuum.c,v 1.6 2003/04/25 15:37:58 drh Exp $
+** $Id: vacuum.c,v 1.7 2003/05/13 00:21:59 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
 
-#define SQLITE_OMIT_VACUUM 1
-
 /*
 ** A structure for holding a dynamic string - a string that can grow
 ** without bound. 
@@ -45,7 +43,7 @@ struct vacuumStruct {
   dynStr s1, s2;       /* Two dynamic strings */
 };
 
-#ifdef SQLITE_OMIT_VACUUM
+#if !defined(SQLITE_OMIT_VACUUM) || SQLITE_OMIT_VACUUM
 /*
 ** Append text to a dynamic string
 */
@@ -205,7 +203,7 @@ static void randomName(char *zBuf){
 ** become a no-op.
 */
 void sqliteVacuum(Parse *pParse, Token *pTableName){
-#ifdef SQLITE_OMIT_VACUUM
+#if !defined(SQLITE_OMIT_VACUUM) || SQLITE_OMIT_VACUUM
   const char *zFilename;  /* full pathname of the database file */
   int nFilename;          /* number of characters  in zFilename[] */
   char *zTemp = 0;        /* a temporary file in same directory as zFilename */