List:Commits« Previous MessageNext Message »
From:paul Date:January 25 2006 8:04pm
Subject:svn commit - mysqldoc@docsrva: r1036 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-25 21:04:45 +0100 (Wed, 25 Jan 2006)
New Revision: 1036

Log:
 r2527@kite-hub:  paul | 2006-01-25 14:04:38 -0600
 INTO OUTFILE/DUMPFILE can appear in two places. (Bug#13863)


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:6663
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2525
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6663
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2527

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-25 19:42:32 UTC (rev 1035)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-25 20:04:45 UTC (rev 1036)
@@ -5907,8 +5907,6 @@
       [SQL_SMALL_RESULT] [SQL_BIG_RESULT] [SQL_BUFFER_RESULT]
       [SQL_CACHE | SQL_NO_CACHE] [SQL_CALC_FOUND_ROWS]
     <replaceable>select_expr</replaceable>, ...
-    [INTO OUTFILE '<replaceable>file_name</replaceable>' <replaceable>export_options</replaceable>
-      | INTO DUMPFILE '<replaceable>file_name</replaceable>']
     [FROM <replaceable>table_references</replaceable>
     [WHERE <replaceable>where_definition</replaceable>]
     [GROUP BY {<replaceable>col_name</replaceable> | <replaceable>expr</replaceable> | <replaceable>position</replaceable>}
@@ -5918,6 +5916,8 @@
       [ASC | DESC] , ...]
     [LIMIT {[<replaceable>offset</replaceable>,] <replaceable>row_count</replaceable> | <replaceable>row_count</replaceable> OFFSET <replaceable>offset</replaceable>}]
     [PROCEDURE <replaceable>procedure_name</replaceable>(<replaceable>argument_list</replaceable>)]
+    [INTO OUTFILE '<replaceable>file_name</replaceable>' <replaceable>export_options</replaceable>
+      | INTO DUMPFILE '<replaceable>file_name</replaceable>']
     [FOR UPDATE | LOCK IN SHARE MODE]]
 </programlisting>
 
@@ -6579,30 +6579,41 @@
             file thus must be world-writable so that you can manipulate
             its contents.
           </para>
+        </listitem>
 
-          <indexterm type="function">
-            <primary>PROCEDURE</primary>
-          </indexterm>
+        <listitem>
+          <para>
+            The <literal>SELECT</literal> syntax diagram at the
+            beginning this section shows the <literal>INTO</literal>
+            clause near the end of the statement. It is also possible to
+            use <literal>INTO OUTFILE</literal> or <literal>INTO
+            DUMPFILE</literal> immediately preceding the
+            <literal>FROM</literal> clause.
+          </para>
         </listitem>
 
         <listitem>
           <para>
+            <indexterm type="function">
+              <primary>PROCEDURE</primary>
+            </indexterm>
+
             A <literal>PROCEDURE</literal> clause names a procedure that
             should process the data in the result set. For an example,
             see <xref linkend="procedure-analyse"/>.
           </para>
-
-          <indexterm type="function">
-            <primary>FOR UPDATE</primary>
-          </indexterm>
-
-          <indexterm type="function">
-            <primary>LOCK IN SHARE MODE</primary>
-          </indexterm>
         </listitem>
 
         <listitem>
           <para>
+            <indexterm type="function">
+              <primary>FOR UPDATE</primary>
+            </indexterm>
+
+            <indexterm type="function">
+              <primary>LOCK IN SHARE MODE</primary>
+            </indexterm>
+
             If you use <literal>FOR UPDATE</literal> on a storage engine
             that uses page or row locks, rows examined by the query are
             write-locked until the end of the current transaction. Using

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-25 19:42:32 UTC (rev 1035)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-25 20:04:45 UTC (rev 1036)
@@ -5923,8 +5923,6 @@
       [SQL_SMALL_RESULT] [SQL_BIG_RESULT] [SQL_BUFFER_RESULT]
       [SQL_CACHE | SQL_NO_CACHE] [SQL_CALC_FOUND_ROWS]
     <replaceable>select_expr</replaceable>, ...
-    [INTO OUTFILE '<replaceable>file_name</replaceable>' <replaceable>export_options</replaceable>
-      | INTO DUMPFILE '<replaceable>file_name</replaceable>']
     [FROM <replaceable>table_references</replaceable>
     [WHERE <replaceable>where_definition</replaceable>]
     [GROUP BY {<replaceable>col_name</replaceable> | <replaceable>expr</replaceable> | <replaceable>position</replaceable>}
@@ -5934,6 +5932,8 @@
       [ASC | DESC] , ...]
     [LIMIT {[<replaceable>offset</replaceable>,] <replaceable>row_count</replaceable> | <replaceable>row_count</replaceable> OFFSET <replaceable>offset</replaceable>}]
     [PROCEDURE <replaceable>procedure_name</replaceable>(<replaceable>argument_list</replaceable>)]
+    [INTO OUTFILE '<replaceable>file_name</replaceable>' <replaceable>export_options</replaceable>
+      | INTO DUMPFILE '<replaceable>file_name</replaceable>']
     [FOR UPDATE | LOCK IN SHARE MODE]]
 </programlisting>
 
@@ -6621,30 +6621,41 @@
             file thus must be world-writable so that you can manipulate
             its contents.
           </para>
+        </listitem>
 
-          <indexterm type="function">
-            <primary>PROCEDURE</primary>
-          </indexterm>
+        <listitem>
+          <para>
+            The <literal>SELECT</literal> syntax diagram at the
+            beginning this section shows the <literal>INTO</literal>
+            clause near the end of the statement. It is also possible to
+            use <literal>INTO OUTFILE</literal> or <literal>INTO
+            DUMPFILE</literal> immediately preceding the
+            <literal>FROM</literal> clause.
+          </para>
         </listitem>
 
         <listitem>
           <para>
+            <indexterm type="function">
+              <primary>PROCEDURE</primary>
+            </indexterm>
+
             A <literal>PROCEDURE</literal> clause names a procedure that
             should process the data in the result set. For an example,
             see <xref linkend="procedure-analyse"/>.
           </para>
-
-          <indexterm type="function">
-            <primary>FOR UPDATE</primary>
-          </indexterm>
-
-          <indexterm type="function">
-            <primary>LOCK IN SHARE MODE</primary>
-          </indexterm>
         </listitem>
 
         <listitem>
           <para>
+            <indexterm type="function">
+              <primary>FOR UPDATE</primary>
+            </indexterm>
+
+            <indexterm type="function">
+              <primary>LOCK IN SHARE MODE</primary>
+            </indexterm>
+
             If you use <literal>FOR UPDATE</literal> on a storage engine
             that uses page or row locks, rows examined by the query are
             write-locked until the end of the current transaction. Using

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-25 19:42:32 UTC (rev 1035)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-25 20:04:45 UTC (rev 1036)
@@ -6518,8 +6518,6 @@
       [SQL_SMALL_RESULT] [SQL_BIG_RESULT] [SQL_BUFFER_RESULT]
       [SQL_CACHE | SQL_NO_CACHE] [SQL_CALC_FOUND_ROWS]
     <replaceable>select_expr</replaceable>, ...
-    [INTO OUTFILE '<replaceable>file_name</replaceable>' <replaceable>export_options</replaceable>
-      | INTO DUMPFILE '<replaceable>file_name</replaceable>']
     [FROM <replaceable>table_references</replaceable>
     [WHERE <replaceable>where_definition</replaceable>]
     [GROUP BY {<replaceable>col_name</replaceable> | <replaceable>expr</replaceable> | <replaceable>position</replaceable>}
@@ -6529,6 +6527,8 @@
       [ASC | DESC] , ...]
     [LIMIT {[<replaceable>offset</replaceable>,] <replaceable>row_count</replaceable> | <replaceable>row_count</replaceable> OFFSET <replaceable>offset</replaceable>}]
     [PROCEDURE <replaceable>procedure_name</replaceable>(<replaceable>argument_list</replaceable>)]
+    [INTO OUTFILE '<replaceable>file_name</replaceable>' <replaceable>export_options</replaceable>
+      | INTO DUMPFILE '<replaceable>file_name</replaceable>']
     [FOR UPDATE | LOCK IN SHARE MODE]]
 </programlisting>
 
@@ -7200,30 +7200,41 @@
             file thus must be world-writable so that you can manipulate
             its contents.
           </para>
+        </listitem>
 
-          <indexterm type="function">
-            <primary>PROCEDURE</primary>
-          </indexterm>
+        <listitem>
+          <para>
+            The <literal>SELECT</literal> syntax diagram at the
+            beginning this section shows the <literal>INTO</literal>
+            clause near the end of the statement. It is also possible to
+            use <literal>INTO OUTFILE</literal> or <literal>INTO
+            DUMPFILE</literal> immediately preceding the
+            <literal>FROM</literal> clause.
+          </para>
         </listitem>
 
         <listitem>
           <para>
+            <indexterm type="function">
+              <primary>PROCEDURE</primary>
+            </indexterm>
+
             A <literal>PROCEDURE</literal> clause names a procedure that
             should process the data in the result set. For an example,
             see <xref linkend="procedure-analyse"/>.
           </para>
-
-          <indexterm type="function">
-            <primary>FOR UPDATE</primary>
-          </indexterm>
-
-          <indexterm type="function">
-            <primary>LOCK IN SHARE MODE</primary>
-          </indexterm>
         </listitem>
 
         <listitem>
           <para>
+            <indexterm type="function">
+              <primary>FOR UPDATE</primary>
+            </indexterm>
+
+            <indexterm type="function">
+              <primary>LOCK IN SHARE MODE</primary>
+            </indexterm>
+
             If you use <literal>FOR UPDATE</literal> on a storage engine
             that uses page or row locks, rows examined by the query are
             write-locked until the end of the current transaction. Using

Thread
svn commit - mysqldoc@docsrva: r1036 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul25 Jan