Do not use a transitive constraint to an IN operator where the RHS is a

constant if there exists a direct == operator to another table in an outer
loop.

FossilOrigin-Name: faedaeace9c7ed9a8aaf96700caee09db0c0c061

diff --git a/manifest b/manifest
index 7f57ed18915217483c3a9181a511252e19cf4256..a5bd0b436bbc044cdf45afcc24c6884ed4217681 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sredundant\sconstraint\schecking\sdue\sto\stransitive\sconstraints.
-D 2013-05-01T17:22:38.014
+C Do\snot\suse\sa\stransitive\sconstraint\sto\san\sIN\soperator\swhere\sthe\sRHS\sis\sa\nconstant\sif\sthere\sexists\sa\sdirect\s==\soperator\sto\sanother\stable\sin\san\souter\nloop.
+D 2013-05-01T17:58:35.871
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -263,7 +263,7 @@ F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
 F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d
 F src/wal.h a4d3da523d55a226a0b28e9058ef88d0a8051887
 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
-F src/where.c e36bbfbf565c7a2ce49c5cd3101ca7310cd379af
+F src/where.c 12d4200eb6ae991cad02367c391db076ac1af1b0
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1060,7 +1060,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P bd92de0e8d922b96513c5d431493800dda7e7562
-R 98be73d126ba545d3f3d37ca997eaf1d
+P 329478cbed06f93652de50abdb31a6b41af02b9e
+R cc457983507eee39e1b071292dee5b26
 U drh
-Z df56d0b87948c58bd48a65ece4cb954b
+Z 944723cfd5dfa8d16765eaab2fd82886

diff --git a/manifest.uuid b/manifest.uuid
index d118513ae8941142b52de85fe4a8c90522f022f5..f88e8ae7a8a6668388e9041ae808fe69f8702cd8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-329478cbed06f93652de50abdb31a6b41af02b9e
\ No newline at end of file
+faedaeace9c7ed9a8aaf96700caee09db0c0c061
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 62f9af676003c166ca565b5083db5c177b548d1b..2de894c3e7d5a6be45f28effdc4978afadfa9803 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -705,7 +705,7 @@ static WhereTerm *findTerm(
                 continue;
               }
             }
-            if( pTerm->prereqRight==0 ){
+            if( pTerm->prereqRight==0 && (pTerm->eOperator&WO_EQ)!=0 ){
               pResult = pTerm;
               goto findTerm_success;
             }else if( pResult==0 ){