From: drh <drh@noemail.net>
Date: Mon, 28 Oct 2019 13:07:01 +0000 (+0000)
Subject: Remove a NEVER() comparison from sqlite3ExprCompare().
X-Git-Tag: version-3.31.0~371
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f28e1bdd93e443292fafb3527a594372b40a7c4;p=thirdparty%2Fsqlite.git

Remove a NEVER() comparison from sqlite3ExprCompare().

FossilOrigin-Name: f4285297e1e7ebef90bfc0f71402a4e1726d31bc15b69fec13a1f0d98fed1f08
---

diff --git a/manifest b/manifest
index 07ad119fd5..8b272728a7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C ALWAYS\smacro\sadded\sfor\scoverage.
-D 2019-10-28T04:20:28.875
+C Remove\sa\sNEVER()\scomparison\sfrom\ssqlite3ExprCompare().
+D 2019-10-28T13:07:01.396
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -478,7 +478,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 91429fb52958fd2ff0f5360a2cc9f41dd811dc8666d22cbb033f1557dd5fdbc2
+F src/expr.c c158710c5de9452fb3f82f038ed96026f1ce1a2a1fcd9bbdb2172f33bfe9fd72
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c ac56f02ffe7a3dff311654f86e3c2fd1ff2eb38862b0c07fd908d8cc0fb4a9a2
 F src/func.c ed33e38cd642058182a31a3f518f2e34f4bbe53aa483335705c153c4d3e50b12
@@ -1848,7 +1848,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 6d1bbba9a004a2491c76b4a7d09edb9b738102c46fdcb3e0f7b22bffa719518e
-R c8301beb24039cb03a30be98ac41fcb7
+P a1e1ba9145049491c593ac70d9e05149662d34770129c270d702f284cd19a481
+R 46f7afb441998f472c7c4a0add076940
 U drh
-Z e9503b1900639f10766b08dd9bfb970e
+Z c81acde55a3e6239d1de172d83220668
diff --git a/manifest.uuid b/manifest.uuid
index 5c92b32a96..c872093d77 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a1e1ba9145049491c593ac70d9e05149662d34770129c270d702f284cd19a481
\ No newline at end of file
+f4285297e1e7ebef90bfc0f71402a4e1726d31bc15b69fec13a1f0d98fed1f08
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 4ae6876620..7dd5577364 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -5030,9 +5030,9 @@ 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->op!=TK_IN
-       && pA->iTable!=pB->iTable 
-       && (pA->iTable!=iTab || NEVER(pB->iTable>=0)) ) return 2;
+      if( pA->op!=TK_IN && pA->iTable!=pB->iTable && pA->iTable!=iTab ){
+        return 2;
+      }
     }
   }
   return 0;