Remove stale requirements marks from the query planner.

FossilOrigin-Name: 76de9914bed11abda3898928633ad09d5a284f84

diff --git a/manifest b/manifest
index a81a623e1c9a080d15633e0a0129e5da37bc9d95..368c393f8f086ceee1ebf47c499b3c6ad8cbc942 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C If\san\serror\soccurs\swhile\swriting\sto\sthe\sdatabase\sfile\sduring\sa\sVACUUM,\sdiscard\sthe\scontents\sof\sthe\sin-memory\scache.\sThis\sis\srequired\sas\sif\sthe\sdatabase\sis\sa\szipvfs\sdatabase,\sthe\scontents\sof\sthe\scache\smay\sbe\sinconsistent\swith\srespect\sto\sthe\sdatabase\sas\sstored\son\sdisk.
-D 2011-10-21T14:27:32.821
+C Remove\sstale\srequirements\smarks\sfrom\sthe\squery\splanner.
+D 2011-10-21T16:47:31.558
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -251,7 +251,7 @@ F src/vtab.c 901791a47318c0562cd0c676a2c6ff1bc530e582
 F src/wal.c 9658df8d404b82e6b2d40fd05944463214e2d935
 F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
-F src/where.c b617d9e1eda592fe6bb38748307440c80da90771
+F src/where.c 922145a39cf91a5dbb83bbc54f0e316f52023fa2
 F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@ -972,7 +972,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 2b35c5144ddcc2ed6d0fcaa8c0ba5d20b9487be7
-R 6634e59d536aa69184f81d4953f270aa
-U dan
-Z b63f5f0c2bfaf50eddb56fa49684523d
+P 07159e84b40b01fa40cac5fad1f433888e5984f8
+R 59b3b1fdd8178d0f82d2b752104b93d8
+U drh
+Z 3d414bcbeacde088fb044f861f268a3d

diff --git a/manifest.uuid b/manifest.uuid
index 7b208dab71653fab6fe72a5712bde10a0071f3b3..f4d78eed3e799b665bf61c84b58576fa43ec517c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-07159e84b40b01fa40cac5fad1f433888e5984f8
\ No newline at end of file
+76de9914bed11abda3898928633ad09d5a284f84
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 2fc990f4c58f5b9086f912151455436f79f29ab4..7a4b8bfaeeb9ef4b96644993f96c383bd24fe077 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -705,7 +705,7 @@ static int isLikeOrGlob(
     if( pVal && sqlite3_value_type(pVal)==SQLITE_TEXT ){
       z = (char *)sqlite3_value_text(pVal);
     }
-    sqlite3VdbeSetVarmask(pParse->pVdbe, iCol); /* IMP: R-31526-56213 */
+    sqlite3VdbeSetVarmask(pParse->pVdbe, iCol);
     assert( pRight->op==TK_VARIABLE || pRight->op==TK_REGISTER );
   }else if( op==TK_STRING ){
     z = pRight->u.zToken;
@@ -723,7 +723,7 @@ static int isLikeOrGlob(
       *ppPrefix = pPrefix;
       if( op==TK_VARIABLE ){
         Vdbe *v = pParse->pVdbe;
-        sqlite3VdbeSetVarmask(v, pRight->iColumn); /* IMP: R-31526-56213 */
+        sqlite3VdbeSetVarmask(v, pRight->iColumn);
         if( *pisComplete && pRight->u.zToken[1] ){
           /* If the rhs of the LIKE expression is a variable, and the current
           ** value of the variable means there is no need to invoke the LIKE
@@ -2637,7 +2637,7 @@ static int valueFromExpr(
    || (pExpr->op==TK_REGISTER && pExpr->op2==TK_VARIABLE)
   ){
     int iVar = pExpr->iColumn;
-    sqlite3VdbeSetVarmask(pParse->pVdbe, iVar); /* IMP: R-31526-56213 */
+    sqlite3VdbeSetVarmask(pParse->pVdbe, iVar);
     *pp = sqlite3VdbeGetValue(pParse->pReprepare, iVar, aff);
     return SQLITE_OK;
   }