Remove an unused variable. Fix code that occurs before a variable

declaration.

FossilOrigin-Name: 01dc032b5bbd9c9ebb1965f176ca5d732cda85ea

diff --git a/manifest b/manifest
index 2d49dfe330d5ed6f383dff96b2db4e1377f2fd6b..87603bebec6ee55f3cce07380da4de65ba5f9e2b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Replace\san\salways-false\sconditional\swith\san\sassert().
-D 2012-10-09T01:23:25.030
+C Remove\san\sunused\svariable.\s\sFix\scode\sthat\soccurs\sbefore\sa\svariable\ndeclaration.
+D 2012-10-09T01:39:25.125
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -249,7 +249,7 @@ F src/vtab.c c7671587d07b76582c495d9305b35c0172cad5d3
 F src/wal.c e1fe8f92a0ea0fef8faa87ec43a127a478589d22
 F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
 F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b
-F src/where.c 50d1d0d3e62a561e8e3057d90f0ff5506a115690
+F src/where.c 7d24dda2b2e8cf62c74e4f5f38bab160596ad658
 F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 0be144b453e0622a085fae8665c32f5676708e00
@@ -1019,7 +1019,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 28d1eb40bfc4c993010ce670ee10780ca2ae5c9c
-R c49291c07fb5c66de29c1d2358325d86
+P 981b9943e4b2b660690ec1ac145abdd3c74f8dd2
+R 14bbf14e4e201d652ae4e981e1902683
 U drh
-Z d8af7ea73f1923e9b2fa65f8c9082c37
+Z 22e61519cc26696da476a58e182c0b3a

diff --git a/manifest.uuid b/manifest.uuid
index 11b99fd3b45043b54bc214da0a8c1d73bf8b4f37..7ec1865ca4124a44a9d3f0f4b1f5bb013205b603 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-981b9943e4b2b660690ec1ac145abdd3c74f8dd2
\ No newline at end of file
+01dc032b5bbd9c9ebb1965f176ca5d732cda85ea
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 1a15897f47fedd21f95942e70e623326ae75898f..f9deb3d418dd8419c01cf59b3431a64cb8d4b670 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -3065,12 +3065,6 @@ static void bestBtreeIndex(WhereBestIdx *p){
     const tRowcnt * const aiRowEst = pProbe->aiRowEst;
     WhereCost pc;               /* Cost of using pProbe */
     double log10N = (double)1;  /* base-10 logarithm of nRow (inexact) */
-    int bRev = 2;               /* 0=forward scan.  1=reverse.  2=undecided */
-
-    WHERETRACE((
-      "   %s(%s):\n",
-      pSrc->pTab->zName, (pIdx ? pIdx->zName : "ipk")
-    ));
 
     /* The following variables are populated based on the properties of
     ** index being evaluated. They are then used to determine the expected
@@ -3152,6 +3146,10 @@ static void bestBtreeIndex(WhereBestIdx *p){
     WhereTerm *pFirstTerm = 0;    /* First term matching the index */
 #endif
 
+    WHERETRACE((
+      "   %s(%s):\n",
+      pSrc->pTab->zName, (pIdx ? pIdx->zName : "ipk")
+    ));
     memset(&pc, 0, sizeof(pc));
     nOrderBy = p->pOrderBy ? p->pOrderBy->nExpr : 0;
     if( p->i ){
@@ -3238,7 +3236,6 @@ static void bestBtreeIndex(WhereBestIdx *p){
     ** in pc.plan.wsFlags. Otherwise, if there is an ORDER BY clause but
     ** the index will scan rows in a different order, set the bSort
     ** variable.  */
-    assert( bRev>=0 && bRev<=2 );
     if( bSort && (pSrc->jointype & JT_LEFT)==0 ){
       int bRev = 2;
       WHERETRACE(("      --> before isSortingIndex: nPriorSat=%d\n",nPriorSat));