Adjust comments to show that subquery flattening restriction (10) was

removed from the code back in 2005.  This is a comment change only.

FossilOrigin-Name: 4ff0eb96bc364baed2d8005c69291ca9240b99dd

diff --git a/manifest b/manifest
index 81daedebdea40bca2b38439d44032a979e662e16..160c3f8d2f7accda67ad716b31a3ca204589b5f0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Small\sperformance\simprovement\sto\sthe\sdirty\slist\shandling\sin\sthe\spager.
-D 2014-09-12T20:30:59.762
+C Adjust\scomments\sto\sshow\sthat\ssubquery\sflattening\srestriction\s(10)\swas\nremoved\sfrom\sthe\scode\sback\sin\s2005.\s\sThis\sis\sa\scomment\schange\sonly.
+D 2014-09-15T11:14:50.871
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -226,7 +226,7 @@ F src/printf.c e74925089a85e3c9f0e315595f41c139d3d118c2
 F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
 F src/resolve.c 0d1621e45fffe4b4396477cf46e41a84b0145ffb
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
-F src/select.c bd8ed75592642f79871fd331d869c37fc6a14846
+F src/select.c 70312b18bf56f741556ed494c398afa0ca3c0e1a
 F src/shell.c c00220cdd7f2027780bc25b78376c16dc24e4b7d
 F src/sqlite.h.in 8b018219ce988913e5977d5de9ab4beb33be23b6
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
@@ -1197,7 +1197,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 320556233e19cdd9d590a09655c3465754700d39
-R 576d19acba6677524711080ef6f39102
+P b332a84d5154f70f3197537df4af243eaebbb011
+R 4fde0e674c64eada90bf3beabe45d5b4
 U drh
-Z 60cbf2357ae42b4a38f44133d16be246
+Z 7e796116236157f7f97effb3ae76fb8a

diff --git a/manifest.uuid b/manifest.uuid
index 7821ed52ba30540ded8ff67ea5bfe3efca195552..30c79b290d302aa943b666062730628b4caa7ca8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b332a84d5154f70f3197537df4af243eaebbb011
\ No newline at end of file
+4ff0eb96bc364baed2d8005c69291ca9240b99dd
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 7ecbf306974b1d2a8e60bd18203a5edbb647ccee..fe6052d6e884315390f8167cc936490d1461b1e3 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -3131,8 +3131,10 @@ static void substSelect(
 **   (9)  The subquery does not use LIMIT or the outer query does not use
 **        aggregates.
 **
-**  (10)  The subquery does not use aggregates or the outer query does not
-**        use LIMIT.
+**  (**)  Restriction (10) was removed from the code on 2005-02-05 but we
+**        accidently carried the comment forward until 2014-09-15.  Original
+**        text: "The subquery does not use aggregates or the outer query does not
+**        use LIMIT."
 **
 **  (11)  The subquery and the outer query do not both have ORDER BY clauses.
 **