From: drh <>
Date: Fri, 19 Mar 2021 14:51:15 +0000 (+0000)
Subject: Restore the NEVER() that was taken out by [f481636f1a0333c6] because that
X-Git-Tag: same-as-3.35.3~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66f9655599f353f5e9bf5ff745d6e162095677a3;p=thirdparty%2Fsqlite.git

Restore the NEVER() that was taken out by [f481636f1a0333c6] because that
case is no longer reachable after the previous check-in.

FossilOrigin-Name: e3a78b2a237a2e101faf01dde913f63641da8854720a9daa4b45a9c5dfe30b1b
---

diff --git a/manifest b/manifest
index 245a4a9d01..e4a5354d0f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\scrash\sthat\scould\soccur\swhen\san\sINSERT\shas\smore\sthan\sone\sON\sCONFLICT\sclause,\sat\sleast\sone\sof\swhich\scontains\san\sunresolvable\ssymbol.
-D 2021-03-19T14:26:24.807
+C Restore\sthe\sNEVER()\sthat\swas\staken\sout\sby\s[f481636f1a0333c6]\sbecause\sthat\ncase\sis\sno\slonger\sreachable\safter\sthe\sprevious\scheck-in.
+D 2021-03-19T14:51:15.769
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -494,7 +494,7 @@ F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c
 F src/delete.c 73f57a9a183532c344a3135cf8f2a5589376e39183e0b5f562d6b61b2af0f4d8
-F src/expr.c d681f0b48b1e16173ad8e1e8f7323cda120a0c517cb7a3d5b329c4e2c57f18bd
+F src/expr.c 984bb2ded097e32ab55c74abcc6f8b190ce5153b6e6d0161b186ba8c936fd8b3
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c e9063648396c58778f77583a678342fe4a9bc82436bf23c5f9f444f2df0fdaa4
 F src/func.c 479f6929be027eb0210cbdde9d3529c012facf082d64a6b854a9415940761e5e
@@ -1910,7 +1910,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 d72d865d3e8503a545603038eb26044bee42e4e8725522be678059ce6517fc8d
-R bcb15951d277d096d901a816b4d30958
-U dan
-Z c79e8253e90008ac8a8434f522d3d1f4
+P 74208386508012326a0e88ec5b4a995d1b99607720bb05785a01c2d89ea03543
+R d7e56a775f22fa2f94d209a470f2d469
+U drh
+Z 01cc36894d56ba5c965c1565c13dffa4
diff --git a/manifest.uuid b/manifest.uuid
index 86f53619df..8e604a742a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-74208386508012326a0e88ec5b4a995d1b99607720bb05785a01c2d89ea03543
\ No newline at end of file
+e3a78b2a237a2e101faf01dde913f63641da8854720a9daa4b45a9c5dfe30b1b
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index bd12ad9f0c..fb8456b193 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -615,7 +615,7 @@ static void codeVectorCompare(
   int isCommuted = ExprHasProperty(pExpr,EP_Commuted);
 
   assert( !ExprHasVVAProperty(pExpr,EP_Immutable) );
-  if( pParse->nErr ) return;
+  if( NEVER(pParse->nErr) ) return;
   if( nLeft!=sqlite3ExprVectorSize(pRight) ){
     sqlite3ErrorMsg(pParse, "row value misused");
     return;