Backout change [4d0b9109f7a5312d4e1] because the conditional it added is

no longer reachable due to check-in [1409758f72c0206c].

FossilOrigin-Name: b3f2696705cc3e7b038f156423f808432a4680ea7e313dc15e34bdf6b1845655

diff --git a/manifest b/manifest
index 4d96a3dc3c86dec272fc5f02ada2c6e894d254d1..4a750547e3342da558706b357c8561ad9d69fe1a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\svariable\sdeclaration\sto\sstart-of-block\sfor\sMSVC.
-D 2020-01-06T18:44:56.988
+C Backout\schange\s[4d0b9109f7a5312d4e1]\sbecause\sthe\sconditional\sit\sadded\sis\nno\slonger\sreachable\sdue\sto\scheck-in\s[1409758f72c0206c].
+D 2020-01-06T18:59:46.667
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -480,7 +480,7 @@ F src/date.c e1d8ac7102f3f283e63e13867acb0efa33861cf34f0faf4cdbaf9fa7a1eb7041
 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
 F src/dbstat.c 5125f559b33787a29f7ded750f2a69080f50a85bced98fe8ad02a99e543c4b44
 F src/delete.c a5c59b9c0251cf7682bc52af0d64f09b1aefc6781a63592c8f1136f7b73c66e4
-F src/expr.c e25df342c1b8b9b87b5d6f9990e5b36f94469b1227c0a492cb5894e379f983ea
+F src/expr.c 631b1f24d07114066c756984b8bc7be64529afb2ea3a5da4e3e262792f320dfa
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 92a248ec0fa4ed8ab60c98d9b188ce173aaf218f32e7737ba77deb2a684f9847
 F src/func.c 259496e4856bd0a3215d16804992f3339f3e8db29f129a5a7285c341488bbe9c
@@ -1853,7 +1853,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d7126a9ced86cb0934d5bde2bf535e6b529c361444c99e723f29dd3eb36e7044
-R b320e1ad9d1e717ef3ddf08aa271c235
-U mistachkin
-Z 364851f12065fc977e3aac0cd38d3fb3
+P 55c136ef61f23a04be1bf351ab7f6bdfa033653c32557a04916cc9770453f261
+Q -4d0b9109f7a5312d4e136395e08b11dad64d746bc106ad44d47675e5b1dcb4ef
+R b0c8464788812694c740c6af7f1efb3b
+U drh
+Z c8dd5390dd99c1b482b234ca2073b61f

diff --git a/manifest.uuid b/manifest.uuid
index b010c45e3644326bb6a4491c6176420031473d1b..dc605456d59cdf44eb341ccc83e920fa4cf7fd8f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-55c136ef61f23a04be1bf351ab7f6bdfa033653c32557a04916cc9770453f261
\ No newline at end of file
+b3f2696705cc3e7b038f156423f808432a4680ea7e313dc15e34bdf6b1845655
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index a89730fe96a2357ba21190751bb50064281cc95c..4e8703e552832daadd6d6039ceeaea191bbe20f0 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -2310,7 +2310,7 @@ static Select *isCandidateForInOpt(Expr *pX){
     testcase( (p->selFlags & (SF_Distinct|SF_Aggregate))==SF_Aggregate );
     return 0; /* No DISTINCT keyword and no aggregate functions */
   }
-  if( p->pGroupBy ) return 0;            /* Has no GROUP BY clause */
+  assert( p->pGroupBy==0 );              /* Has no GROUP BY clause */
   if( p->pLimit ) return 0;              /* Has no LIMIT clause */
   if( p->pWhere ) return 0;              /* Has no WHERE clause */
   pSrc = p->pSrc;