From: drh <drh@noemail.net>
Date: Fri, 27 Sep 2019 15:01:02 +0000 (+0000)
Subject: Fix sqlite3ExprCompare() so that it ignores differences in the Expr.iTable
X-Git-Tag: version-3.30.0~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=818a3b548647d7a314771f455c93be5ff6440047;p=thirdparty%2Fsqlite.git

Fix sqlite3ExprCompare() so that it ignores differences in the Expr.iTable
field for IN operators, as otherwise it can lead to false negatives, which
is usually harmless, but can cause problems for an assert() in the window
function logic.

FossilOrigin-Name: 6a204b192a6c6f21988cab217366f21b14c672b81ceadc43675761a6d8c4484f
---

diff --git a/manifest b/manifest
index b7c4022fa2..696ba3a3a2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\sminor\stest\sfile\sfixes.
-D 2019-09-26T20:57:53.477
+C Fix\ssqlite3ExprCompare()\sso\sthat\sit\signores\sdifferences\sin\sthe\sExpr.iTable\nfield\sfor\sIN\soperators,\sas\sotherwise\sit\scan\slead\sto\sfalse\snegatives,\swhich\nis\susually\sharmless,\sbut\scan\scause\sproblems\sfor\san\sassert()\sin\sthe\swindow\nfunction\slogic.
+D 2019-09-27T15:01:02.442
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -477,7 +477,7 @@ F src/date.c e1d8ac7102f3f283e63e13867acb0efa33861cf34f0faf4cdbaf9fa7a1eb7041
 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
 F src/dbstat.c c12833de69cb655751487d2c5a59607e36be1c58ba1f4bd536609909ad47b319
 F src/delete.c d08c9e01a2664afd12edcfa3a9c6578517e8ff8735f35509582693adbe0edeaf
-F src/expr.c 66d1f3eb7dfbc346a90096c98d7b7caebf208283db5d74f226f6c157a4bc79b2
+F src/expr.c be398d5b595be69f759e5bd686c72643b314c4554ab46fecbb35b1b0764df533
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 6b79f4c2447691aa9ac86e2a6a774b65f3b3dd053d4220a4893051a0de20f82e
 F src/func.c ed33e38cd642058182a31a3f518f2e34f4bbe53aa483335705c153c4d3e50b12
@@ -530,7 +530,7 @@ F src/shell.c.in 026d8a5b3e1c477f23ef027e1ecb4c86e9e3fed0aa922e3825cf4d7feb6bdd6
 F src/sqlite.h.in 5725a6b20190a1e8d662077a1c1c8ea889ad7be90dd803f914c2de226f5fe6ab
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h cef696ce3293242c67b2339763608427bf72ee66f1f3a05389ac2a7b46001c31
-F src/sqliteInt.h 5fd0a9606244801994237383f1003ba3530863ca8980122286e03a4e6338444c
+F src/sqliteInt.h 6e47f6e042368d28cf919c1ce969fb16c5256cbe5289b8d328bc3c1e12b61584
 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -1845,7 +1845,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e768179baacb2423205a774cc8149fe58ed86a9320102aff4844b1d8933aa1db
-R 4ad26743e9ded1875bce184cfaaacaab
-U dan
-Z 6b4a7dc3b746ae2b0bb2a8276c6ee58f
+P 352878fe1cbcf7b6803624544bba5a95565d1638d4dd09e91764ddad17889301
+R 9e8dd2d92764e8f929452cac96d88716
+U drh
+Z 3815533c4dbe2c1ea6f4d3a491fda5ac
diff --git a/manifest.uuid b/manifest.uuid
index 9c2f0661b1..e7eb6b7bb6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-352878fe1cbcf7b6803624544bba5a95565d1638d4dd09e91764ddad17889301
\ No newline at end of file
+6a204b192a6c6f21988cab217366f21b14c672b81ceadc43675761a6d8c4484f
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 43f20d8768..22c0d0ee50 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -4957,6 +4957,7 @@ int sqlite3ExprCompare(Parse *pParse, Expr *pA, Expr *pB, int iTab){
       if( pA->iColumn!=pB->iColumn ) return 2;
       if( pA->op2!=pB->op2 ) return 2;
       if( pA->iTable!=pB->iTable 
+       && pA->op!=TK_IN
        && (pA->iTable!=iTab || NEVER(pB->iTable>=0)) ) return 2;
     }
   }
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 2934a16e9d..9d19b4ce75 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2474,6 +2474,7 @@ struct Expr {
                          ** TK_REGISTER: register number
                          ** TK_TRIGGER: 1 -> new, 0 -> old
                          ** EP_Unlikely:  134217728 times likelihood
+                         ** TK_IN: ephemerial table holding RHS
                          ** TK_SELECT_COLUMN: Number of columns on the LHS
                          ** TK_SELECT: 1st register of result vector */
   ynVar iColumn;         /* TK_COLUMN: column index.  -1 for rowid.