From: drh <drh@noemail.net>
Date: Wed, 4 Oct 2017 02:30:45 +0000 (+0000)
Subject: Fix a minor typo in the query flattener header comment.  No code changes.
X-Git-Tag: version-3.21.0~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e76acc654f196fdef2d0c1322300be962da36ea8;p=thirdparty%2Fsqlite.git

Fix a minor typo in the query flattener header comment.  No code changes.

FossilOrigin-Name: d050dc605c24bcf60c0c47d13612ad53b871d3d4eff681c0c1b933acf53fb5ee
---

diff --git a/manifest b/manifest
index b9988d900e..b5978e8b5e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplify\sthe\scomputation\sof\stypes\son\scolumns\sof\sa\sview.
-D 2017-10-03T19:53:12.453
+C Fix\sa\sminor\stypo\sin\sthe\squery\sflattener\sheader\scomment.\s\sNo\scode\schanges.
+D 2017-10-04T02:30:45.805
 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 fa9fd8750cc55c4367a77fcf1911a770049c947d26d4a3b1e2b9eebf63425f0a
+F src/select.c 4248b28ec9db68653d3ea5137b7c7f5bad52451486ccf1a2247cd39ca3b9e35c
 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 f5c395834c2a776beba6fe172cc4a5e428ce30b9cb4259ef8e440f10455a41e9
-R 3c121170a1dd33a49ba61d24de5be781
+P 772b0db1469c9e1c2728cf65dd070e29c624e75c3a5da72ee1297f15d758dd13
+R 5f83cd7ed7c6212a42bd83dd65e953e5
 U drh
-Z 7bba01406d4dc6644f9e7f5f6c664e0a
+Z 4de48cca341b3f710b375c35ea16b291
diff --git a/manifest.uuid b/manifest.uuid
index b336d47568..0509f11b51 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-772b0db1469c9e1c2728cf65dd070e29c624e75c3a5da72ee1297f15d758dd13
\ No newline at end of file
+d050dc605c24bcf60c0c47d13612ad53b871d3d4eff681c0c1b933acf53fb5ee
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 63078a9a2b..0ef316a540 100644
--- a/src/select.c
+++ b/src/select.c
@@ -3355,7 +3355,7 @@ static void substSelect(
 **  (17)  If the subquery is a compound select, then
 **        (17a) all compound operators must be a UNION ALL, and
 **        (17b) no terms within the subquery compound may be aggregate
-**              or DISTINT, and
+**              or DISTINCT, and
 **        (17c) every term within the subquery compound must have a FROM clause
 **        (17d) the outer query may not be
 **              (17d1) aggregate, or