Another bug fix from two check-ins ago. (CVS 2062)

FossilOrigin-Name: c46eef2f6d32b8546e1441e7e6f103e6ad97f1f4

diff --git a/manifest b/manifest
index 0d48190eb35f2bbe92c61503678bee66d5fb310c..da25ae5fc5d71b50475876dddc4bae5282f0b1cc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\sin\sthe\sprevious\scheck-in.\s(CVS\s2061)
-D 2004-11-05T05:20:40
+C Another\sbug\sfix\sfrom\stwo\scheck-ins\sago.\s(CVS\s2062)
+D 2004-11-05T05:23:59
 F Makefile.in c4d2416860f472a1e3393714d0372074197565df
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -31,7 +31,7 @@ F src/attach.c e49d09dad9f5f9fb10b4b0c1be5a70ae4c45e689
 F src/auth.c 3b81f2a42f48a62c2c9c9b0eda31a157c681edea
 F src/btree.c f97b5a3919147fe36f776d08c80212ba3ea883aa
 F src/btree.h 3166388fa58c5594d8064d38b43440d79da38fb6
-F src/build.c c0a293eafc891570ed97bdf9eae534dfd9c083b3
+F src/build.c 06a4eb8f29e9b356f85ff4eac64c112fe5ff7d3d
 F src/date.c 34bdb0082db7ec2a83ef00063f7b44e61ee19dad
 F src/delete.c 832adc6fe1c07b7e28e1b4c1038d2b06f7397dd4
 F src/expr.c be18081d2959a2cc53846d0fbedfec40fbfa1d6e
@@ -252,7 +252,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl fdacb0ba2d39831e8a6240d05a490026ad4c4e4c
-P ac2d5a605c873cac68bfde4bbe3797608a47b21e
-R cca658cbf5bc30d0daf5877e1730d68e
+P 9d259d48defda57ab0bd66460bd2ba7f3a2695e9
+R 92da916c53f47131944620c16002f610
 U drh
-Z 27a04ec4e8abb6ee61172b3db6363dc7
+Z 7c042e1052dcd679d1913cf5116ea822

diff --git a/manifest.uuid b/manifest.uuid
index 4a87e5547100b7c718b5ea2ed155451faade6e0b..4b17d9bca59e8532082886391ad2d40e764b18c1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9d259d48defda57ab0bd66460bd2ba7f3a2695e9
\ No newline at end of file
+c46eef2f6d32b8546e1441e7e6f103e6ad97f1f4
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 862766701f44dd307c71a86a7215c144758f3ec3..fcf11f274b52f88cd7910d5766a45a1215399cfc 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -24,9 +24,9 @@
 **     PRAGMA
 **
 <<<<<<< build.c
-** $Id: build.c,v 1.265 2004/11/05 05:20:40 drh Exp $
+** $Id: build.c,v 1.266 2004/11/05 05:23:59 drh Exp $
 =======
-** $Id: build.c,v 1.265 2004/11/05 05:20:40 drh Exp $
+** $Id: build.c,v 1.266 2004/11/05 05:23:59 drh Exp $
 >>>>>>> 1.262
 */
 #include "sqliteInt.h"
@@ -1663,7 +1663,7 @@ static void destroyTable(Parse *pParse, Table *pTab){
 #ifdef SQLITE_OMIT_AUTOVACUUM
   destroyRootPage(pParse, pTab->tnum, pTab->iDb);
   for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
-    destroyRootPage(v, pIdx->tnum, pIdx->iDb);
+    destroyRootPage(pParse, pIdx->tnum, pIdx->iDb);
   }
 #else
   /* If the database may be auto-vacuum capable (if SQLITE_OMIT_AUTOVACUUM