Avoid using left-most column STAT3 samples if the left-most column has an

equality constrain and there are inequality constraints on the second column.

FossilOrigin-Name: 31b4e63b3c30fcad22340d84d6076a306f26b49e

diff --git a/manifest b/manifest
index a763743c174332d11a516bfdb74edf07f152f73c..02972f03fab4c9f63e05f350667a53532343f7b0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Limit\sthe\snumber\sof\smemset()\scalls\sused\swhen\sdetermining\sa\stemporary\sfile\sname\son\sWindows.\s\sAlso,\sfix\sa\sharmless\scompiler\swarning.
-D 2013-07-31T23:28:36.603
+C Avoid\susing\sleft-most\scolumn\sSTAT3\ssamples\sif\sthe\sleft-most\scolumn\shas\san\nequality\sconstrain\sand\sthere\sare\sinequality\sconstraints\son\sthe\ssecond\scolumn.
+D 2013-08-01T16:52:50.320
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -290,7 +290,7 @@ F src/vtab.c 2e8b489db47e20ae36cd247932dc671c9ded0624
 F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
-F src/where.c a55e27475c3d4c72c8bf1aaf9ece70e47e8731cf
+F src/where.c fe1d056ffa4638fcdc22b4da1315b0ad98c3e872
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1103,7 +1103,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 33ba1f4c5dc2ef8292adf17a32ade0cde0887d88
-R 22ac6c086833ea6790806cfd601e6a5b
-U mistachkin
-Z 4d19b2638b72ab835325f17f2f967fc6
+P 136fc2931b156f91cdd76a7a009298cdf09d826a
+R 548b934e9d909f49470ebc18af6d5c19
+U drh
+Z e690d571856325e865e41cb4d68cbd8b

diff --git a/manifest.uuid b/manifest.uuid
index 491b5fb557c5fe7aeedaa6cf3505ce5f0fd848a9..f30aafd4cd043e9d896a41dc5b6f969c38b4e48b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-136fc2931b156f91cdd76a7a009298cdf09d826a
\ No newline at end of file
+31b4e63b3c30fcad22340d84d6076a306f26b49e
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 9f65d551a345096ca3b495caa300f8ccb9af8286..8a265a92887b64647ff591a2ad9c3f4128250017 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -4420,7 +4420,7 @@ static int whereLoopAddBtreeIndex(
       pNew->nOut = saved_nOut>rDiv+10 ? saved_nOut - rDiv : 10;
     }
 #ifdef SQLITE_ENABLE_STAT3
-    if( pNew->u.btree.nEq==1 && pProbe->nSample
+    if( pNew->u.btree.nEq==1 && pProbe->nSample && saved_nEq==0
      &&  OptimizationEnabled(db, SQLITE_Stat3) ){
       tRowcnt nOut = 0;
       if( (pTerm->eOperator & (WO_EQ|WO_ISNULL))!=0 ){