Author: paul
Date: 2006-02-09 16:37:52 +0100 (Thu, 09 Feb 2006)
New Revision: 1250
Log:
r7249@frost: paul | 2006-02-09 09:20:42 -0600
UNION tweak.
Modified:
trunk/
trunk/refman-4.1/sql-syntax.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/sql-syntax.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7245
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2927
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7249
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2927
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2006-02-09 14:04:10 UTC (rev 1249)
+++ trunk/refman-4.1/sql-syntax.xml 2006-02-09 15:37:52 UTC (rev 1250)
@@ -7303,7 +7303,7 @@
<remark role="help-topic" condition="UNION"/>
<remark role="help-keywords">
- ALL
+ ALL DISTINCT
</remark>
<remark role="help-syntax"/>
@@ -7484,9 +7484,9 @@
of rows. If <literal>ORDER BY</literal> appears with
<literal>LIMIT</literal>, it is used to determine the subset
of the selected rows to retrieve for the
- <literal>SELECT</literal>, but does not affect the order of
- those rows in the final <literal>UNION</literal> result. If
- <literal>ORDER BY</literal> appears without
+ <literal>SELECT</literal>, but does not necessarily affect the
+ order of those rows in the final <literal>UNION</literal>
+ result. If <literal>ORDER BY</literal> appears without
<literal>LIMIT</literal> in a <literal>SELECT</literal>, it is
optimized away because it will have no effect anyway.
</para>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2006-02-09 14:04:10 UTC (rev 1249)
+++ trunk/refman-5.0/sql-syntax.xml 2006-02-09 15:37:52 UTC (rev 1250)
@@ -7696,7 +7696,7 @@
<remark role="help-topic" condition="UNION"/>
<remark role="help-keywords">
- ALL
+ ALL DISTINCT
</remark>
<remark role="help-syntax"/>
@@ -7864,9 +7864,9 @@
of rows. If <literal>ORDER BY</literal> appears with
<literal>LIMIT</literal>, it is used to determine the subset
of the selected rows to retrieve for the
- <literal>SELECT</literal>, but does not affect the order of
- those rows in the final <literal>UNION</literal> result. If
- <literal>ORDER BY</literal> appears without
+ <literal>SELECT</literal>, but does not necessarily affect the
+ order of those rows in the final <literal>UNION</literal>
+ result. If <literal>ORDER BY</literal> appears without
<literal>LIMIT</literal> in a <literal>SELECT</literal>, it is
optimized away because it will have no effect anyway.
</para>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-02-09 14:04:10 UTC (rev 1249)
+++ trunk/refman-5.1/sql-syntax.xml 2006-02-09 15:37:52 UTC (rev 1250)
@@ -8277,7 +8277,7 @@
<remark role="help-topic" condition="UNION"/>
<remark role="help-keywords">
- ALL
+ ALL DISTINCT
</remark>
<remark role="help-syntax"/>
@@ -8445,9 +8445,9 @@
of rows. If <literal>ORDER BY</literal> appears with
<literal>LIMIT</literal>, it is used to determine the subset
of the selected rows to retrieve for the
- <literal>SELECT</literal>, but does not affect the order of
- those rows in the final <literal>UNION</literal> result. If
- <literal>ORDER BY</literal> appears without
+ <literal>SELECT</literal>, but does not necessarily affect the
+ order of those rows in the final <literal>UNION</literal>
+ result. If <literal>ORDER BY</literal> appears without
<literal>LIMIT</literal> in a <literal>SELECT</literal>, it is
optimized away because it will have no effect anyway.
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1250 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 9 Feb |
