svn commit - mysqldoc@docsrva: r14871 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-5.4 refman-6.0

[jon.stephens]

Author: jstephens
Date: 2009-05-09 08:13:33 +0200 (Sat, 09 May 2009)
New Revision: 14871

Log:

End confusion about DML and DDL statements

Also moved/added para for harmony across versions (was missing in 4.1)

Fixes Docs Bug #44727



Modified:
   trunk/refman-4.1/sql-syntax-server-administration.xml
   trunk/refman-5.0/sql-syntax-server-administration.xml
   trunk/refman-5.1/sql-syntax-server-administration.xml
   trunk/refman-5.4/sql-syntax-server-administration.xml
   trunk/refman-6.0/sql-syntax-server-administration.xml


Modified: trunk/refman-4.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-server-administration.xml	2009-05-09 04:58:49 UTC (rev 14870)
+++ trunk/refman-4.1/sql-syntax-server-administration.xml	2009-05-09 06:13:33 UTC (rev 14871)
Changed blocks: 1, Lines Added: 10, Lines Deleted: 0; 973 bytes

@@ -6890,6 +6890,16 @@
       </para>
 
       <para>
+        Warnings are generated for DML statements such as
+        <literal role="stmt">INSERT</literal>,
+        <literal role="stmt">UPDATE</literal>, and
+        <literal role="stmt" condition="load-data">LOAD DATA
+        INFILE</literal> as well as DDL statements such as
+        <literal role="stmt">CREATE TABLE</literal> and
+        <literal role="stmt">ALTER TABLE</literal>.
+      </para>
+
+      <para>
         <literal role="stmt">SHOW WARNINGS</literal> is implemented as
         of MySQL 4.1.0. A related statement, <literal role="stmt">SHOW
         ERRORS</literal>, shows only the errors. See


Modified: trunk/refman-5.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-server-administration.xml	2009-05-09 04:58:49 UTC (rev 14870)
+++ trunk/refman-5.0/sql-syntax-server-administration.xml	2009-05-09 06:13:33 UTC (rev 14871)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 10; 1494 bytes

@@ -8604,6 +8604,16 @@
       </para>
 
       <para>
+        Warnings are generated for DML statements such as
+        <literal role="stmt">INSERT</literal>,
+        <literal role="stmt">UPDATE</literal>, and
+        <literal role="stmt" condition="load-data">LOAD DATA
+        INFILE</literal> as well as DDL statements such as
+        <literal role="stmt">CREATE TABLE</literal> and
+        <literal role="stmt">ALTER TABLE</literal>.
+      </para>
+
+      <para>
         A related statement, <literal role="stmt">SHOW ERRORS</literal>,
         shows only the errors. See <xref linkend="show-errors"/>.
       </para>

@@ -8646,16 +8656,6 @@
       </para>
 
       <para>
-        Warnings are generated for statements such as
-        <literal role="stmt" condition="load-data">LOAD DATA
-        INFILE</literal> and DML statements such as
-        <literal role="stmt">INSERT</literal>,
-        <literal role="stmt">UPDATE</literal>,
-        <literal role="stmt">CREATE TABLE</literal>, and
-        <literal role="stmt">ALTER TABLE</literal>.
-      </para>
-
-      <para>
         The following <literal role="stmt">DROP TABLE</literal>
         statement results in a note:
       </para>


Modified: trunk/refman-5.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-server-administration.xml	2009-05-09 04:58:49 UTC (rev 14870)
+++ trunk/refman-5.1/sql-syntax-server-administration.xml	2009-05-09 06:13:33 UTC (rev 14871)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 10; 1494 bytes

@@ -9707,6 +9707,16 @@
       </para>
 
       <para>
+        Warnings are generated for DML statements such as
+        <literal role="stmt">INSERT</literal>,
+        <literal role="stmt">UPDATE</literal>, and
+        <literal role="stmt" condition="load-data">LOAD DATA
+        INFILE</literal> as well as DDL statements such as
+        <literal role="stmt">CREATE TABLE</literal> and
+        <literal role="stmt">ALTER TABLE</literal>.
+      </para>
+
+      <para>
         A related statement, <literal role="stmt">SHOW ERRORS</literal>,
         shows only the errors. See <xref linkend="show-errors"/>.
       </para>

@@ -9749,16 +9759,6 @@
       </para>
 
       <para>
-        Warnings are generated for statements such as
-        <literal role="stmt" condition="load-data">LOAD DATA
-        INFILE</literal> and DML statements such as
-        <literal role="stmt">INSERT</literal>,
-        <literal role="stmt">UPDATE</literal>,
-        <literal role="stmt">CREATE TABLE</literal>, and
-        <literal role="stmt">ALTER TABLE</literal>.
-      </para>
-
-      <para>
         The following <literal role="stmt">DROP TABLE</literal>
         statement results in a note:
       </para>


Modified: trunk/refman-5.4/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.4/sql-syntax-server-administration.xml	2009-05-09 04:58:49 UTC (rev 14870)
+++ trunk/refman-5.4/sql-syntax-server-administration.xml	2009-05-09 06:13:33 UTC (rev 14871)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 10; 1494 bytes

@@ -9387,6 +9387,16 @@
       </para>
 
       <para>
+        Warnings are generated for DML statements such as
+        <literal role="stmt">INSERT</literal>,
+        <literal role="stmt">UPDATE</literal>, and
+        <literal role="stmt" condition="load-data">LOAD DATA
+        INFILE</literal> as well as DDL statements such as
+        <literal role="stmt">CREATE TABLE</literal> and
+        <literal role="stmt">ALTER TABLE</literal>.
+      </para>
+
+      <para>
         A related statement, <literal role="stmt">SHOW ERRORS</literal>,
         shows only the errors. See <xref linkend="show-errors"/>.
       </para>

@@ -9429,16 +9439,6 @@
       </para>
 
       <para>
-        Warnings are generated for statements such as
-        <literal role="stmt" condition="load-data">LOAD DATA
-        INFILE</literal> and DML statements such as
-        <literal role="stmt">INSERT</literal>,
-        <literal role="stmt">UPDATE</literal>,
-        <literal role="stmt">CREATE TABLE</literal>, and
-        <literal role="stmt">ALTER TABLE</literal>.
-      </para>
-
-      <para>
         The following <literal role="stmt">DROP TABLE</literal>
         statement results in a note:
       </para>


Modified: trunk/refman-6.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-server-administration.xml	2009-05-09 04:58:49 UTC (rev 14870)
+++ trunk/refman-6.0/sql-syntax-server-administration.xml	2009-05-09 06:13:33 UTC (rev 14871)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 10; 1494 bytes

@@ -9606,6 +9606,16 @@
       </para>
 
       <para>
+        Warnings are generated for DML statements such as
+        <literal role="stmt">INSERT</literal>,
+        <literal role="stmt">UPDATE</literal>, and
+        <literal role="stmt" condition="load-data">LOAD DATA
+        INFILE</literal> as well as DDL statements such as
+        <literal role="stmt">CREATE TABLE</literal> and
+        <literal role="stmt">ALTER TABLE</literal>.
+      </para>
+
+      <para>
         A related statement, <literal role="stmt">SHOW ERRORS</literal>,
         shows only the errors. See <xref linkend="show-errors"/>.
       </para>

@@ -9648,16 +9658,6 @@
       </para>
 
       <para>
-        Warnings are generated for statements such as
-        <literal role="stmt" condition="load-data">LOAD DATA
-        INFILE</literal> and DML statements such as
-        <literal role="stmt">INSERT</literal>,
-        <literal role="stmt">UPDATE</literal>,
-        <literal role="stmt">CREATE TABLE</literal>, and
-        <literal role="stmt">ALTER TABLE</literal>.
-      </para>
-
-      <para>
         The following <literal role="stmt">DROP TABLE</literal>
         statement results in a note:
       </para>