List:Commits« Previous MessageNext Message »
From:paul.dubois Date:August 7 2009 7:52pm
Subject:svn commit - mysqldoc@docsrva: r16024 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.4 refman-6.0
View as plain text  
Author: paul
Date: 2009-08-07 21:52:11 +0200 (Fri, 07 Aug 2009)
New Revision: 16024

Log:
 r43388@frost:  paul | 2009-08-07 14:42:51 -0500
 Fix docs bug:
 Bug#46434: SELECT... INTO OUTFILE adds backslashes


Modified:
   trunk/refman-4.1/sql-syntax-data-manipulation.xml
   trunk/refman-5.0/sql-syntax-data-manipulation.xml
   trunk/refman-5.1/sql-syntax-data-manipulation.xml
   trunk/refman-5.4/Notes
   trunk/refman-5.4/sql-syntax-data-manipulation.xml
   trunk/refman-6.0/sql-syntax-data-manipulation.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:43387
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:43388
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546


Modified: trunk/refman-4.1/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-data-manipulation.xml	2009-08-07 19:52:02 UTC (rev 16023)
+++ trunk/refman-4.1/sql-syntax-data-manipulation.xml	2009-08-07 19:52:11 UTC (rev 16024)
Changed blocks: 2, Lines Added: 17, Lines Deleted: 11; 2304 bytes

@@ -4085,20 +4085,20 @@
           <literal role="stmt" condition="select">SELECT ... INTO
           OUTFILE</literal> is the complement of
           <literal role="stmt" condition="load-data">LOAD DATA
-          INFILE</literal>; the syntax for the
-          <replaceable>export_options</replaceable> part of the
-          statement consists of the same <literal>FIELDS</literal> and
-          <literal>LINES</literal> clauses that are used with the
-          <literal role="stmt" condition="load-data">LOAD DATA
-          INFILE</literal> statement. See <xref linkend="load-data"/>.
+          INFILE</literal>. Column values are dumped using the
+          <literal>binary</literal> character set. In effect, there is
+          no character set conversion. If a table contains columns in
+          several character sets, the output data file will as well and
+          you may not be able to reload the file correctly.
         </para>
 
         <para>
-          Column values are dumped using the <literal>binary</literal>
-          character set. In effect, there is no character set
-          conversion. If a table contains columns in several character
-          sets, the output data file will as well and you may not be
-          able to reload the file correctly.
+          The syntax for the <replaceable>export_options</replaceable>
+          part of the statement consists of the same
+          <literal>FIELDS</literal> and <literal>LINES</literal> clauses
+          that are used with the
+          <literal role="stmt" condition="load-data">LOAD DATA
+          INFILE</literal> statement.
         </para>
 
         <para>

@@ -4185,6 +4185,12 @@
   LINES TERMINATED BY '\n'
   FROM test_table;
 </programlisting>
+
+        <para>
+          See <xref linkend="load-data"/>, for further information about
+          the <literal>FIELDS</literal> and <literal>LINES</literal>
+          clauses, including their default values and allowable values.
+        </para>
       </listitem>
 
       <listitem>


Modified: trunk/refman-5.0/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-data-manipulation.xml	2009-08-07 19:52:02 UTC (rev 16023)
+++ trunk/refman-5.0/sql-syntax-data-manipulation.xml	2009-08-07 19:52:11 UTC (rev 16024)
Changed blocks: 2, Lines Added: 17, Lines Deleted: 11; 2304 bytes

@@ -4359,20 +4359,20 @@
           <literal role="stmt" condition="select">SELECT ... INTO
           OUTFILE</literal> is the complement of
           <literal role="stmt" condition="load-data">LOAD DATA
-          INFILE</literal>; the syntax for the
-          <replaceable>export_options</replaceable> part of the
-          statement consists of the same <literal>FIELDS</literal> and
-          <literal>LINES</literal> clauses that are used with the
-          <literal role="stmt" condition="load-data">LOAD DATA
-          INFILE</literal> statement. See <xref linkend="load-data"/>.
+          INFILE</literal>. Column values are dumped using the
+          <literal>binary</literal> character set. In effect, there is
+          no character set conversion. If a table contains columns in
+          several character sets, the output data file will as well and
+          you may not be able to reload the file correctly.
         </para>
 
         <para>
-          Column values are dumped using the <literal>binary</literal>
-          character set. In effect, there is no character set
-          conversion. If a table contains columns in several character
-          sets, the output data file will as well and you may not be
-          able to reload the file correctly.
+          The syntax for the <replaceable>export_options</replaceable>
+          part of the statement consists of the same
+          <literal>FIELDS</literal> and <literal>LINES</literal> clauses
+          that are used with the
+          <literal role="stmt" condition="load-data">LOAD DATA
+          INFILE</literal> statement.
         </para>
 
         <para>

@@ -4459,6 +4459,12 @@
   LINES TERMINATED BY '\n'
   FROM test_table;
 </programlisting>
+
+        <para>
+          See <xref linkend="load-data"/>, for further information about
+          the <literal>FIELDS</literal> and <literal>LINES</literal>
+          clauses, including their default values and allowable values.
+        </para>
       </listitem>
 
       <listitem>


Modified: trunk/refman-5.1/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-data-manipulation.xml	2009-08-07 19:52:02 UTC (rev 16023)
+++ trunk/refman-5.1/sql-syntax-data-manipulation.xml	2009-08-07 19:52:11 UTC (rev 16024)
Changed blocks: 2, Lines Added: 17, Lines Deleted: 11; 2304 bytes

@@ -4405,20 +4405,20 @@
           <literal role="stmt" condition="select">SELECT ... INTO
           OUTFILE</literal> is the complement of
           <literal role="stmt" condition="load-data">LOAD DATA
-          INFILE</literal>; the syntax for the
-          <replaceable>export_options</replaceable> part of the
-          statement consists of the same <literal>FIELDS</literal> and
-          <literal>LINES</literal> clauses that are used with the
-          <literal role="stmt" condition="load-data">LOAD DATA
-          INFILE</literal> statement. See <xref linkend="load-data"/>.
+          INFILE</literal>. Column values are dumped using the
+          <literal>binary</literal> character set. In effect, there is
+          no character set conversion. If a table contains columns in
+          several character sets, the output data file will as well and
+          you may not be able to reload the file correctly.
         </para>
 
         <para>
-          Column values are dumped using the <literal>binary</literal>
-          character set. In effect, there is no character set
-          conversion. If a table contains columns in several character
-          sets, the output data file will as well and you may not be
-          able to reload the file correctly.
+          The syntax for the <replaceable>export_options</replaceable>
+          part of the statement consists of the same
+          <literal>FIELDS</literal> and <literal>LINES</literal> clauses
+          that are used with the
+          <literal role="stmt" condition="load-data">LOAD DATA
+          INFILE</literal> statement.
         </para>
 
         <para>

@@ -4505,6 +4505,12 @@
   LINES TERMINATED BY '\n'
   FROM test_table;
 </programlisting>
+
+        <para>
+          See <xref linkend="load-data"/>, for further information about
+          the <literal>FIELDS</literal> and <literal>LINES</literal>
+          clauses, including their default values and allowable values.
+        </para>
       </listitem>
 
       <listitem>


Modified: trunk/refman-5.4/Notes
===================================================================
--- trunk/refman-5.4/Notes	2009-08-07 19:52:02 UTC (rev 16023)
+++ trunk/refman-5.4/Notes	2009-08-07 19:52:11 UTC (rev 16024)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 0; 380 bytes

@@ -67,3 +67,6 @@
 
 Are these removed in 5.4?
 * LOAD DATA FROM MASTER
+
+LOAD DATA has an XML-related rows-identified thing. It's not in the 6.0
+manual, either.


Modified: trunk/refman-5.4/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-5.4/sql-syntax-data-manipulation.xml	2009-08-07 19:52:02 UTC (rev 16023)
+++ trunk/refman-5.4/sql-syntax-data-manipulation.xml	2009-08-07 19:52:11 UTC (rev 16024)
Changed blocks: 2, Lines Added: 17, Lines Deleted: 11; 2304 bytes

@@ -5014,20 +5014,20 @@
           <literal role="stmt" condition="select">SELECT ... INTO
           OUTFILE</literal> is the complement of
           <literal role="stmt" condition="load-data">LOAD DATA
-          INFILE</literal>; the syntax for the
-          <replaceable>export_options</replaceable> part of the
-          statement consists of the same <literal>FIELDS</literal> and
-          <literal>LINES</literal> clauses that are used with the
-          <literal role="stmt" condition="load-data">LOAD DATA
-          INFILE</literal> statement. See <xref linkend="load-data"/>.
+          INFILE</literal>. Column values are dumped using the
+          <literal>binary</literal> character set. In effect, there is
+          no character set conversion. If a table contains columns in
+          several character sets, the output data file will as well and
+          you may not be able to reload the file correctly.
         </para>
 
         <para>
-          Column values are dumped using the <literal>binary</literal>
-          character set. In effect, there is no character set
-          conversion. If a table contains columns in several character
-          sets, the output data file will as well and you may not be
-          able to reload the file correctly.
+          The syntax for the <replaceable>export_options</replaceable>
+          part of the statement consists of the same
+          <literal>FIELDS</literal> and <literal>LINES</literal> clauses
+          that are used with the
+          <literal role="stmt" condition="load-data">LOAD DATA
+          INFILE</literal> statement.
         </para>
 
         <para>

@@ -5114,6 +5114,12 @@
   LINES TERMINATED BY '\n'
   FROM test_table;
 </programlisting>
+
+        <para>
+          See <xref linkend="load-data"/>, for further information about
+          the <literal>FIELDS</literal> and <literal>LINES</literal>
+          clauses, including their default values and allowable values.
+        </para>
       </listitem>
 
       <listitem>


Modified: trunk/refman-6.0/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-data-manipulation.xml	2009-08-07 19:52:02 UTC (rev 16023)
+++ trunk/refman-6.0/sql-syntax-data-manipulation.xml	2009-08-07 19:52:11 UTC (rev 16024)
Changed blocks: 2, Lines Added: 17, Lines Deleted: 11; 2304 bytes

@@ -5030,20 +5030,20 @@
           <literal role="stmt" condition="select">SELECT ... INTO
           OUTFILE</literal> is the complement of
           <literal role="stmt" condition="load-data">LOAD DATA
-          INFILE</literal>; the syntax for the
-          <replaceable>export_options</replaceable> part of the
-          statement consists of the same <literal>FIELDS</literal> and
-          <literal>LINES</literal> clauses that are used with the
-          <literal role="stmt" condition="load-data">LOAD DATA
-          INFILE</literal> statement. See <xref linkend="load-data"/>.
+          INFILE</literal>. Column values are dumped using the
+          <literal>binary</literal> character set. In effect, there is
+          no character set conversion. If a table contains columns in
+          several character sets, the output data file will as well and
+          you may not be able to reload the file correctly.
         </para>
 
         <para>
-          Column values are dumped using the <literal>binary</literal>
-          character set. In effect, there is no character set
-          conversion. If a table contains columns in several character
-          sets, the output data file will as well and you may not be
-          able to reload the file correctly.
+          The syntax for the <replaceable>export_options</replaceable>
+          part of the statement consists of the same
+          <literal>FIELDS</literal> and <literal>LINES</literal> clauses
+          that are used with the
+          <literal role="stmt" condition="load-data">LOAD DATA
+          INFILE</literal> statement.
         </para>
 
         <para>

@@ -5130,6 +5130,12 @@
   LINES TERMINATED BY '\n'
   FROM test_table;
 </programlisting>
+
+        <para>
+          See <xref linkend="load-data"/>, for further information about
+          the <literal>FIELDS</literal> and <literal>LINES</literal>
+          clauses, including their default values and allowable values.
+        </para>
       </listitem>
 
       <listitem>


Thread
svn commit - mysqldoc@docsrva: r16024 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.4 refman-6.0paul.dubois7 Aug