Author: paul
Date: 2006-01-30 15:13:09 +0100 (Mon, 30 Jan 2006)
New Revision: 1123
Log:
r6904@frost: paul | 2006-01-30 08:12:35 -0600
Slight change to DO description regarding error-handling.
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:6902
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2588
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6904
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2588
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2006-01-30 14:09:25 UTC (rev 1122)
+++ trunk/refman-4.1/sql-syntax.xml 2006-01-30 14:13:09 UTC (rev 1123)
@@ -3578,10 +3578,12 @@
<para>
<literal>DO</literal> executes the expressions but does not
- return any results. This is shorthand for <literal>SELECT
- <replaceable>expr</replaceable>, ...</literal>, but has the
- advantage that it is slightly faster when you do not care about
- the result.
+ return any results. In most respects, <literal>DO</literal> is
+ shorthand for <literal>SELECT <replaceable>expr</replaceable>,
+ ...</literal>, but has the advantage that it is slightly faster
+ when you do not care about the result. However,
+ <literal>DO</literal> does not report any errors. Instead, it
+ reports errors as warnings.
</para>
<para>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2006-01-30 14:09:25 UTC (rev 1122)
+++ trunk/refman-5.0/sql-syntax.xml 2006-01-30 14:13:09 UTC (rev 1123)
@@ -3506,10 +3506,12 @@
<para>
<literal>DO</literal> executes the expressions but does not
- return any results. This is shorthand for <literal>SELECT
- <replaceable>expr</replaceable>, ...</literal>, but has the
- advantage that it is slightly faster when you do not care about
- the result.
+ return any results. In most respects, <literal>DO</literal> is
+ shorthand for <literal>SELECT <replaceable>expr</replaceable>,
+ ...</literal>, but has the advantage that it is slightly faster
+ when you do not care about the result. However,
+ <literal>DO</literal> does not report any errors. Instead, it
+ reports errors as warnings.
</para>
<para>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-01-30 14:09:25 UTC (rev 1122)
+++ trunk/refman-5.1/sql-syntax.xml 2006-01-30 14:13:09 UTC (rev 1123)
@@ -4114,10 +4114,12 @@
<para>
<literal>DO</literal> executes the expressions but does not
- return any results. This is shorthand for <literal>SELECT
- <replaceable>expr</replaceable>, ...</literal>, but has the
- advantage that it is slightly faster when you do not care about
- the result.
+ return any results. In most respects, <literal>DO</literal> is
+ shorthand for <literal>SELECT <replaceable>expr</replaceable>,
+ ...</literal>, but has the advantage that it is slightly faster
+ when you do not care about the result. However,
+ <literal>DO</literal> does not report any errors. Instead, it
+ reports errors as warnings.
</para>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1123 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 30 Jan |