From: drh <drh@noemail.net>
Date: Fri, 8 Feb 2019 12:46:07 +0000 (+0000)
Subject: Cherrypick the fix for ticket [4e8e4857d32d401f] from trunk.
X-Git-Tag: version-3.27.1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df7537a7d92adce48e4777e57073e287bb0583e9;p=thirdparty%2Fsqlite.git

Cherrypick the fix for ticket [4e8e4857d32d401f] from trunk.

FossilOrigin-Name: d5d944d7947d7b44ba9a1c844418af49c5f39dbe84f181af790bb1412daed578
---

diff --git a/manifest b/manifest
index 7572aede0e..f8b24026e7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\sthe\sversion\snumber\sto\s3.27.1.
-D 2019-02-08T12:44:08.416
+C Cherrypick\sthe\sfix\sfor\sticket\s[4e8e4857d32d401f]\sfrom\strunk.
+D 2019-02-08T12:46:07.957
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 178d8eb6840771149cee40b322d1b3be30d330198c522c903c1b66fb5a1bfca4
@@ -601,7 +601,7 @@ F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
 F src/walker.c 7607f1a68130c028255d8d56094ea602fc402c79e1e35a46e6282849d90d5fe4
 F src/where.c 8a207cb2ca6b99e1edb1e4bbff9b0504385a759cbf66180d1deb34d80ca4b799
 F src/whereInt.h 5f14db426ca46a83eabab1ae9aa6d4b8f27504ad35b64c290916289b1ddb2e88
-F src/wherecode.c 89d2ec668aec884dfa7ac500c6744e42ec0590fcd72fb740a8b48326a8412811
+F src/wherecode.c a571d8d7c19d6db786a201f2df8788b320fefcb2842f2a1eb9a85b85e91bc35f
 F src/whereexpr.c 36b47f7261d6b6f1a72d774c113b74beddf6745aba1018e64b196e29db233442
 F src/window.c df2456386e0b1553a8d1fcf3a0ddc4c058fe2c650ea8c74b6bf8862082ddafc9
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1061,7 +1061,7 @@ F test/join.test d53a3662762eff50b65da8775201e609878a27dd0885a1ae7bcde9bb46cecbc
 F test/join2.test 10f7047e723ebd68b2f47189be8eed20451a6f665d8bf46f1774c640d1062417
 F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
 F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
-F test/join5.test 1df0a9b94f34a6c40c7f708f550dcb1cb80109f0ed774dba5a95915fbfbb6bc9
+F test/join5.test f8b5ffdf3c1513486b52ad4e49225507ecee5005f210eb18688f791d25370972
 F test/join6.test cfe6503791ceb0cbb509966740286ec423cbf10b
 F test/journal1.test c7b768041b7f494471531e17abc2f4f5ebf9e5096984f43ed17c4eb80ba34497
 F test/journal2.test 9dac6b4ba0ca79c3b21446bbae993a462c2397c4
@@ -1804,10 +1804,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 97744701c3bd414e6c9d7182639d8c2ce7cf124c4fce625071ae65658ac61713
-R 89eaa0fde4af812b2eca85c2a914d5ef
-T *branch * branch-3.27
-T *sym-branch-3.27 *
-T -sym-trunk *
+P b94d5428bb78a49bba8a92556d6368673652290c75db877f6aba431ad14c5fde
+Q +440a7cda000164d3b46109caf2e1dde80681ba9b0d94ba9be6847d2b917445cf
+R 2251df76230cd55e64293ef8a825ebab
 U drh
-Z e06770915c3d5c8faecb97047db22f3d
+Z b244e4c43be553deb57135944f88ebbe
diff --git a/manifest.uuid b/manifest.uuid
index 085e000d15..e087739ef3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b94d5428bb78a49bba8a92556d6368673652290c75db877f6aba431ad14c5fde
\ No newline at end of file
+d5d944d7947d7b44ba9a1c844418af49c5f39dbe84f181af790bb1412daed578
\ No newline at end of file
diff --git a/src/wherecode.c b/src/wherecode.c
index cffa789593..19315779bf 100644
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -1756,8 +1756,13 @@ Bitmask sqlite3WhereCodeOneLoopStart(
     ** the cursor. In this case it is important to do the full evaluation,
     ** as the result of the expression may not be NULL, even if all table
     ** column values are.  https://www.sqlite.org/src/info/7fa8049685b50b5a
+    **
+    ** Also, do not do this when processing one index an a multi-index
+    ** OR clause, since the transformation will become invalid once we
+    ** move forward to the next index.
+    ** https://sqlite.org/src/info/4e8e4857d32d401f
     */
-    if( pLevel->iLeftJoin==0 ){
+    if( pLevel->iLeftJoin==0 && (pWInfo->wctrlFlags & WHERE_OR_SUBCLAUSE)==0 ){
       whereIndexExprTrans(pIdx, iCur, iIdxCur, pWInfo);
     }
 
diff --git a/test/join5.test b/test/join5.test
index 31280c5d17..f4ded796bf 100644
--- a/test/join5.test
+++ b/test/join5.test
@@ -241,6 +241,18 @@ do_execsql_test 6.3.2 {
   SELECT ifnull(z, '!!!') FROM t3 LEFT JOIN t4 ON (x=y);
 } {!!!}
 
+# 2019-02-08 https://sqlite.org/src/info/4e8e4857d32d401f
+reset_db
+do_execsql_test 6.100 {
+  CREATE TABLE t1(aa, bb);
+  CREATE INDEX t1x1 on t1(abs(aa), abs(bb));
+  INSERT INTO t1 VALUES(-2,-3),(+2,-3),(-2,+3),(+2,+3);
+  SELECT * FROM (t1) 
+   WHERE ((abs(aa)=1 AND 1=2) OR abs(aa)=2)
+     AND abs(bb)=3
+  ORDER BY +1, +2;
+} {-2 -3 -2 3 2 -3 2 3}
+
 #-------------------------------------------------------------------------
 #
 reset_db