Remove the WHERE_LIKELIHOOD bit, as it does not seem to effect any result.

FossilOrigin-Name: 1cbe7a0883e081611a50524517d70e0b6c5199d2

diff --git a/manifest b/manifest
index 83f779bee0fe311bf95da4e91ac2aa8ac5e21a3c..c9a894b1f1ea0d0df996859cb93673d600de6793 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stypo\sin\sa\srequirements\smark\scomment\sin\sa\stest\sscript.\s\sNo\schanges\sto\ncode.
-D 2014-06-02T18:24:55.152
+C Remove\sthe\sWHERE_LIKELIHOOD\sbit,\sas\sit\sdoes\snot\sseem\sto\seffect\sany\sresult.
+D 2014-06-02T21:00:34.572
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -294,8 +294,8 @@ F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
-F src/where.c 308ed08c648fb7e3d7ba5896363dd86b2a0cc616
-F src/whereInt.h 6804c2e5010378568c2bb1350477537755296a46
+F src/where.c a7d59dd5d5bf6d6ab905fb549567a0a11376de25
+F src/whereInt.h 929c1349b5355fd44f22cee5c14d72b3329c58a6
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1173,7 +1173,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 9f18b303cd1bc5779d82669884f802c7889b4947
-R d2860e47e4361323fe5044697b7809e3
+P 75ff459b06e1a5c180d316d227ce2f73c99a1f52
+R 48bae0e8ed57c3dbc05f2ecb6659ff4f
 U drh
-Z 3c888acab84366f73445c2218a0f8a8d
+Z ba8e8519c6b4bbb2b73e8471af00ac41

diff --git a/manifest.uuid b/manifest.uuid
index 2dd57bbecb4d483a57642682063ec7a142e419c6..9feaf6cdcfe99096d16a52fab0f8ff39e1329555 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-75ff459b06e1a5c180d316d227ce2f73c99a1f52
\ No newline at end of file
+1cbe7a0883e081611a50524517d70e0b6c5199d2
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index ccecccb12e61d2b321c5b4d33ef0a93cb22c6df6..f914004b25303a50eb184bbaec518e01ed3d9ed1 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -4286,7 +4286,6 @@ static int whereLoopAddBtreeIndex(
         testcase( eOp & WO_IN );
         pNew->nOut += pTerm->truthProb;
         pNew->nOut -= nIn;
-        pNew->wsFlags |= WHERE_LIKELIHOOD;
       }else{
 #ifdef SQLITE_ENABLE_STAT3_OR_STAT4
         tRowcnt nOut = 0;
@@ -4295,7 +4294,6 @@ static int whereLoopAddBtreeIndex(
          && pNew->u.btree.nEq<=pProbe->nSampleCol
          && OptimizationEnabled(db, SQLITE_Stat3) 
          && ((eOp & WO_IN)==0 || !ExprHasProperty(pTerm->pExpr, EP_xIsSelect))
-         && (pNew->wsFlags & WHERE_LIKELIHOOD)==0
         ){
           Expr *pExpr = pTerm->pExpr;
           if( (eOp & (WO_EQ|WO_ISNULL))!=0 ){

diff --git a/src/whereInt.h b/src/whereInt.h
index 010cd6e8ae8ac961890ced0c1bded1ed6e4ede18..72e7530db94ba722f8cd485ee4e8f4090c1276fe 100644 (file)
--- a/src/whereInt.h
+++ b/src/whereInt.h
@@ -458,4 +458,3 @@ struct WhereInfo {
 #define WHERE_AUTO_INDEX   0x00004000  /* Uses an ephemeral index */
 #define WHERE_SKIPSCAN     0x00008000  /* Uses the skip-scan algorithm */
 #define WHERE_UNQ_WANTED   0x00010000  /* WHERE_ONEROW would have been helpful*/
-#define WHERE_LIKELIHOOD   0x00020000  /* A likelihood() is affecting nOut */