From: drh <drh@noemail.net>
Date: Sat, 30 Sep 2017 11:47:06 +0000 (+0000)
Subject: More details in the header comment of pushDownWhereTerms().  No changes to
X-Git-Tag: version-3.21.0~49^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67cc51a4919ae33125715e4742ce7a1ada1ad8ac;p=thirdparty%2Fsqlite.git

More details in the header comment of pushDownWhereTerms().  No changes to
code.

FossilOrigin-Name: 928486231ff7cc0df17a5aa23a080a1b8720e168db5227a7dbd34861283ba689
---

diff --git a/manifest b/manifest
index 010e54d3d6..55d7ee5a1f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthe\sSQLITE_Stat34\soptimization\sswitch\sis\salways\s0x800,\sa\svalue\nwhich\sis\shard-coded\sin\sthe\sTH3\stest\ssuite.
-D 2017-09-30T10:50:34.309
+C More\sdetails\sin\sthe\sheader\scomment\sof\spushDownWhereTerms().\s\sNo\schanges\sto\ncode.
+D 2017-09-30T11:47:06.786
 F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
@@ -458,7 +458,7 @@ F src/printf.c 40aee47ae9be4bd3dbdc8968bd07fddc027be8edec8daddf24d3391d36698a1c
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
-F src/select.c 55a17d54eec9093baf4ccc25342e4b2168cb8198805ed08a44fd4ae389b34b19
+F src/select.c 19ebf10e33de8e1f327cbc844aff12af74bdf0513b3eb1b712b7bcdca4c9bdb5
 F src/shell.c c1206a23d9239f8f51751d3be9b8c3b02fa4103546bea1add7f864d84a8276ab
 F src/shell.c.in bb9720a8c5c98d3984b16ab7540e7142bcae959666ecf248bfc523a1d44220ee
 F src/sqlite.h.in ab4f8a29d1580dfaeb6891fa1b83cff8229ba0daa56994707ceaca71495d9ab7
@@ -1655,7 +1655,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 71f0adf7ca6824c3aba69104b9976dbb71b377474529e1a36220b4804293501e
-R abcf7527b871a7332be788888884086b
+P 6aed4ea34c4163c682ad5bb2956fdf4f3a3ad048fefd3edab0fef6761c3783cc
+R f601c290e8e6d8b405b953711d4d99d6
 U drh
-Z a8cf074d964a4716a4bd6f57e83e01aa
+Z 5fa1972988b6fbd3340440a07005926a
diff --git a/manifest.uuid b/manifest.uuid
index 6801513137..8a76d04632 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6aed4ea34c4163c682ad5bb2956fdf4f3a3ad048fefd3edab0fef6761c3783cc
\ No newline at end of file
+928486231ff7cc0df17a5aa23a080a1b8720e168db5227a7dbd34861283ba689
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 9c3544ae05..b7c459011c 100644
--- a/src/select.c
+++ b/src/select.c
@@ -3831,7 +3831,11 @@ static int flattenSubquery(
 **
 **   (1) (** This restriction was removed on 2017-09-29.  We used to
 **           disallow this optimization for aggregate subqueries, but now
-**           it is allowed by putting the extra terms on the HAVING clause **)
+**           it is allowed by putting the extra terms on the HAVING clause.
+**           The added HAVING clause is pointless if the subquery lacks
+**           a GROUP BY clause.  But such a HAVING clause is also harmless
+**           so there does not appear to be any reason to add extra logic
+**           to suppress it. **)
 **
 **   (2) The inner query is the recursive part of a common table expression.
 **