diff --git a/manifest b/manifest index 74bc8de275..0d48190eb3 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C More\suse\sof\ssqlite3NestedParse.\s\sThis\sversion\sof\sthe\scode\sdoes\snot\swork.\s(CVS\s2060) -D 2004-11-05T05:10:29 +C Fix\sa\sbug\sin\sthe\sprevious\scheck-in.\s(CVS\s2061) +D 2004-11-05T05:20:40 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 936fb262f26c5b06e7f46ee40778c8d22015bd73 +F src/build.c c0a293eafc891570ed97bdf9eae534dfd9c083b3 F src/date.c 34bdb0082db7ec2a83ef00063f7b44e61ee19dad F src/delete.c 832adc6fe1c07b7e28e1b4c1038d2b06f7397dd4 F src/expr.c be18081d2959a2cc53846d0fbedfec40fbfa1d6e @@ -85,7 +85,7 @@ F src/where.c 6e637a6b3e61fe3104adc4e5caa4738bf6570daa F test/all.test 929bfa932b55e75c96fe2203f7650ba451c1862c F test/attach.test e305dd59a375e37c658c6d401f19f8a95880bf9a F test/attach2.test 399128a7b3b209a339a8dbf53ca2ed42eb982d1a -F test/attach3.test 4a22dd620a346fe3d8189c05d8e2c55541402915 +F test/attach3.test 287af46653e7435b2d1eda10d8115dcc8a6883e2 F test/auth.test 1cc252d9e7b3bdc1314199cbf3a0d3c5ed026c21 F test/autovacuum.test a5b11269daac313bea6694b04473fdd0e16e439a F test/bigfile.test d3744a8821ce9abb8697f2826a3e3d22b719e89f @@ -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 2d302931a69d1add1dae9f820133872b4fefe93e -R 9d8077c20528ce9bd12b7dfa2968a7b4 +P ac2d5a605c873cac68bfde4bbe3797608a47b21e +R cca658cbf5bc30d0daf5877e1730d68e U drh -Z 772277e47e3b8f9b2ce58ca939573a56 +Z 27a04ec4e8abb6ee61172b3db6363dc7 diff --git a/manifest.uuid b/manifest.uuid index e7c46a0e81..4a87e55471 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ac2d5a605c873cac68bfde4bbe3797608a47b21e \ No newline at end of file +9d259d48defda57ab0bd66460bd2ba7f3a2695e9 \ No newline at end of file diff --git a/src/build.c b/src/build.c index 7bc36fe45a..862766701f 100644 --- a/src/build.c +++ b/src/build.c @@ -24,9 +24,9 @@ ** PRAGMA ** <<<<<<< build.c -** $Id: build.c,v 1.264 2004/11/05 05:10:29 drh Exp $ +** $Id: build.c,v 1.265 2004/11/05 05:20:40 drh Exp $ ======= -** $Id: build.c,v 1.264 2004/11/05 05:10:29 drh Exp $ +** $Id: build.c,v 1.265 2004/11/05 05:20:40 drh Exp $ >>>>>>> 1.262 */ #include "sqliteInt.h" @@ -2368,7 +2368,7 @@ void sqlite3DropIndex(Parse *pParse, SrcList *pName){ sqlite3VdbeChangeP3(v, base+1, pIndex->zName, 0); sqlite3ChangeCookie(db, v, pIndex->iDb); /* sqlite3VdbeAddOp(v, OP_Destroy, pIndex->tnum, pIndex->iDb); */ - destroyRootPage(v, pIndex->tnum, pIndex->iDb); + destroyRootPage(pParse, pIndex->tnum, pIndex->iDb); sqlite3VdbeAddOp(v, OP_Close, 0, 0); sqlite3VdbeOp3(v, OP_DropIndex, pIndex->iDb, 0, pIndex->zName, 0); } diff --git a/test/attach3.test b/test/attach3.test index 8075377dc5..293e9c0387 100644 --- a/test/attach3.test +++ b/test/attach3.test @@ -12,7 +12,7 @@ # focus of this script is testing the ATTACH and DETACH commands # and schema changes to attached databases. # -# $Id: attach3.test,v 1.11 2004/11/05 05:10:29 drh Exp $ +# $Id: attach3.test,v 1.12 2004/11/05 05:20:40 drh Exp $ #