From 151446e793e6cf9398afd0fe48c45e2cbada8c4a Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Wed, 26 May 2021 14:32:33 +0000
Subject: [PATCH] Update an assert() in wherecode.c that might fail following
 an unrelated SQL error.

FossilOrigin-Name: 3e2c36a8272ab3c1777638c0ed8222e7ff04657fe1c40f74a63b99a5a90258cc
---
 manifest            | 14 +++++++-------
 manifest.uuid       |  2 +-
 src/wherecode.c     |  2 +-
 test/rowvalue9.test | 13 +++++++++++++
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 0ff07745a5..514e2f6f3c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\srun\ssessionbig.test\sas\spart\sof\sthe\ssession_strm\spermutation.\sIt\sis\stoo\sslow.
-D 2021-05-25T16:10:12.465
+C Update\san\sassert()\sin\swherecode.c\sthat\smight\sfail\sfollowing\san\sunrelated\sSQL\serror.
+D 2021-05-26T14:32:33.099
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -633,7 +633,7 @@ F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c 7342becedf3f8a26f9817f08436bdf8b56ad69af83705f6b9320a0ad3092c2ac
 F src/where.c 32f41c3c93c6785e0077e3a2cdc669c3ccfe70173787847be77f294c18fc7dc3
 F src/whereInt.h 9248161dd004f625ce5d3841ca9b99fed3fc8d61522cf76340fc5217dbe1375b
-F src/wherecode.c adb672751620b034cfc92b6e6595d80f1ea3ec1ffb54275378f960ba25d9aac1
+F src/wherecode.c b40f3addc024e546dd6c3c93261b0f484e98597bbde04f2a04b95dd570e00d02
 F src/whereexpr.c 5a9c9f5d2dac4bcdcaae3035034b4667523f731df228e0bb1d4efc669efa9da5
 F src/window.c ce5e73ab88a8527d268673906bf89cbe58c61bca8d54d38ed8c33c3220a276ee
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1315,7 +1315,7 @@ F test/rowvalue5.test c81c7d8cf36711ab37675ad7376084ae2a359cb6
 F test/rowvalue6.test d19b54feb604d5601f8614b15e214e0774c01087
 F test/rowvalue7.test c1cbdbf407029db01f87764097c6ac02a1c5a37efd2776eff32a9cdfdf6f2dba
 F test/rowvalue8.test 5900eddad9e2c3c2e26f1a95f74aafc1232ee5e0
-F test/rowvalue9.test d8dd2c6ecac432dadaa79e41dc2434f007be1b6b
+F test/rowvalue9.test cb5380df82dca9db463081e26952c1e097b34fc2c2ac87453970c048d97df687
 F test/rowvaluefault.test 7cd9ccc6c2fbdd881672984087aad0491bb75504
 F test/rowvaluevtab.test cd9747bb3f308086944c07968f547ad6b05022e698d80b9ffbdfe09ce0b8da6f
 F test/rtree.test 0c8d9dd458d6824e59683c19ab2ffa9ef946f798
@@ -1916,7 +1916,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 0b45e821911e4a852edd6d9e9cfe5f9de33337edf76fb12b79adaf11a4b83e8a
-R e5e65b96cfadc0ae4669cc65c5b6cd06
+P 708ce7ad8acee702d08d1987aa253b0bfc3fd97255d6e4153122b03eba337570
+R 2526ebb62b8cafe1a6bcc018fc81592f
 U dan
-Z 9a7abfbe0eb3b33eb92b702ee941abb0
+Z 78f8b00cbc933cd939f882f5d83b5332
diff --git a/manifest.uuid b/manifest.uuid
index a58aa2c87c..4d7a5f522c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-708ce7ad8acee702d08d1987aa253b0bfc3fd97255d6e4153122b03eba337570
\ No newline at end of file
+3e2c36a8272ab3c1777638c0ed8222e7ff04657fe1c40f74a63b99a5a90258cc
\ No newline at end of file
diff --git a/src/wherecode.c b/src/wherecode.c
index 892772b1cc..71ba9f7633 100644
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -1122,7 +1122,7 @@ static void codeExprOrVector(Parse *pParse, Expr *p, int iReg, int nReg){
       }
     }
   }else{
-    assert( nReg==1 );
+    assert( nReg==1 || pParse->nErr );
     sqlite3ExprCode(pParse, p, iReg);
   }
 }
diff --git a/test/rowvalue9.test b/test/rowvalue9.test
index 0fa652f97d..611aa3fbb7 100644
--- a/test/rowvalue9.test
+++ b/test/rowvalue9.test
@@ -297,5 +297,18 @@ do_execsql_test 7.3 {
   );
 } { 1 4 1 5 }
 
+#-------------------------------------------------------------------------
+#
+do_execsql_test 8.1 {
+  CREATE TABLE t1(a ,b FLOAT);
+  CREATE INDEX t1x1 ON t1(a,b,a,a,a,a,a,a,a,a,a,b);
+}
+
+do_catchsql_test 8.2 {
+  SELECT a FROM t1 NATURAL JOIN t1 WHERE (a,b)> (SELECT 2 IN (SELECT 2,2), 2);
+} {1 {sub-select returns 2 columns - expected 1}}
+
 
 finish_test
+
+
-- 
2.47.2