Remove a branch made unreachable by check-in [e893f88750ea64d4].

FossilOrigin-Name: 20d7dc120dc964a0236da719e4de22bff5110b95da396e2ac6790e9f6b667899

diff --git a/manifest b/manifest
index 67269dd76e15a526a0cab410b2d0f364bd5f9927..a4ab321f7ef6bbb64f594dc6bfb893a8ed3adc50 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\ssegfault\sthat\scould\soccur\sfollowing\san\sOOM\scondition.
-D 2021-03-04T16:10:23.652
+C Remove\sa\sbranch\smade\sunreachable\sby\scheck-in\s[e893f88750ea64d4].
+D 2021-03-04T16:32:28.875
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -542,7 +542,7 @@ F src/printf.c 2b03a80d7c11bb422115dca175a18bf430e9c9dbaa0eee63b758f0c022f8f34f
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 022aeaa3f3ef6faf76c48fffa97a7ec906606d175a1cd3dd5c186543fa7a1fa3
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c ec87ae50ab868872aca4c92abd9ed9bd0f5f5c76ceb95b66de32d4012f1b255b
+F src/select.c c213c99cfb85cee59138c18969d656a206a5b7ef0f3a1734b4b617f3cda82f84
 F src/shell.c.in 844417f84df1f6c4fce1c815629a888cfdcf219e86513e9c332bbcc38832f477
 F src/sqlite.h.in 8855a19f37ade8dad189a9e48233a2ebe1b46faf469c7eb0906a654e252dcc57
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1909,7 +1909,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 e893f88750ea64d45922429e022c585748974016404f2a2b7952f5a227865246
-R fefc06970223f41fbfb5aaf65f9e4865
-U dan
-Z dcea2abb16cf955ac0b7ba17a45df39a
+P 9adf6e2469d18bc3bfc0c804cfcaa692e23ab6b3e13465dcfc51c4b111b05cb4
+R 24b35917dc0167d6daa4ac4ab0d8d79c
+U drh
+Z a5d338c9d3983240f488ab70afcfd421

diff --git a/manifest.uuid b/manifest.uuid
index bbeaacf951910873fe96f7871e287911c478b349..edaadda71a200b7831b2a73ebd93d182ae79decc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9adf6e2469d18bc3bfc0c804cfcaa692e23ab6b3e13465dcfc51c4b111b05cb4
\ No newline at end of file
+20d7dc120dc964a0236da719e4de22bff5110b95da396e2ac6790e9f6b667899
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 4842f7ea5081544597c6f984fd22c07255e68954..f54b62247a6c0d363deabc2d400bfab9329339e9 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -3036,10 +3036,8 @@ static int generateOutputSubroutine(
     ** if it is the RHS of a row-value IN operator.
     */
     case SRT_Mem: {
-      if( pParse->nErr==0 ){
-        testcase( pIn->nSdst>1 );
-        sqlite3ExprCodeMove(pParse, pIn->iSdst, pDest->iSDParm, pIn->nSdst);
-      }
+      testcase( pIn->nSdst>1 );
+      sqlite3ExprCodeMove(pParse, pIn->iSdst, pDest->iSDParm, pIn->nSdst);
       /* The LIMIT clause will jump out of the loop for us */
       break;
     }