Remove an old variable declaration that was commented out using a C++ comment. (CVS...

FossilOrigin-Name: 0b972f14f00340cbd4e310dea6d1a4f1c05f5628

diff --git a/manifest b/manifest
index cbd070240356c9d467156bf40bbcff39a4bf6fd5..65136f4a2230a64d988bfcc6f94c0140eb3bbe4a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Set\sthe\sOPFLG_IN1\sflag\son\sa\scouple\sof\sextra\sopcodes.\s(CVS\s6070)
-D 2008-12-29T10:39:54
+C Remove\san\sold\svariable\sdeclaration\sthat\swas\scommented\sout\susing\sa\sC++\scomment.\s(CVS\s6071)
+D 2008-12-29T14:51:06
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 77635d0909c2067cee03889a1e04ce910d8fb809
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -207,7 +207,7 @@ F src/vdbeblob.c b0dcebfafedcf9c0addc7901ad98f6f986c08935
 F src/vdbemem.c f9c859ac17e2e05a0f249868ce4f191f69edd31d
 F src/vtab.c e39e011d7443a8d574b1b9cde207a35522e6df43
 F src/walker.c 488c2660e13224ff70c0c82761118efb547f8f0d
-F src/where.c 29c57ed5b081164d77782a1224e74e0b06be2790
+F src/where.c a102f06e77603fc3db0d1bc9ad637fb034bb7520
 F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 597662c5d777a122f9a3df0047ea5c5bd383a911
@@ -686,7 +686,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 3464d369d3b6899ec726cf5b42b68b1dac2ba982
-R 18ab6bbe2acad0c91cc7b30e9c634db0
+P 03d0350441ef5fa5a9f22fcb0b760200614cf9f9
+R e6df0aec1c2fd3ed6e98c372cd9a8d74
 U danielk1977
-Z 69d1ac8257e029b8703d5cb87f6151a6
+Z da88efba546d400f6b796c5b557437c9

diff --git a/manifest.uuid b/manifest.uuid
index b54e4650ca2eda9c62893754c51abce3ce84647f..378b5423f0d1008bf5aefcbfbcc775f2d43db70c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-03d0350441ef5fa5a9f22fcb0b760200614cf9f9
\ No newline at end of file
+0b972f14f00340cbd4e310dea6d1a4f1c05f5628
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 2f33f82db3dd0d4ef40398946864d1451754dc42..ff557c2df05cee939ebdf74c250dde3e43062731 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -16,7 +16,7 @@
 ** so is applicable.  Because this module is responsible for selecting
 ** indices, you might also think of this module as the "query optimizer".
 **
-** $Id: where.c,v 1.347 2008/12/28 20:47:03 drh Exp $
+** $Id: where.c,v 1.348 2008/12/29 14:51:06 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -2943,7 +2943,6 @@ WhereInfo *sqlite3WhereBegin(
   Vdbe *v = pParse->pVdbe;   /* The virtual database engine */
   Bitmask notReady;          /* Cursors that are not yet positioned */
   WhereMaskSet *pMaskSet;    /* The expression mask set */
-  //WhereClause wc;          /* The WHERE clause is divided into these terms */
   WhereClause *pWC;               /* Decomposition of the WHERE clause */
   struct SrcList_item *pTabItem;  /* A single entry from pTabList */
   WhereLevel *pLevel;             /* A single level in the pWInfo list */