Author: jstephens
Date: 2006-10-08 08:55:16 +0200 (Sun, 08 Oct 2006)
New Revision: 3575
Log:
Reformat.
Modified:
trunk/refman-5.0/client-utility-programs.xml
trunk/refman-5.0/news-5.0.xml
trunk/refman-5.1/client-utility-programs.xml
trunk/refman-5.1/news-5.1.xml
Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml 2006-10-08 06:54:01 UTC (rev 3574)
+++ trunk/refman-5.0/client-utility-programs.xml 2006-10-08 06:55:16 UTC (rev 3575)
Changed blocks: 4, Lines Added: 16, Lines Deleted: 15; 4188 bytes
@@ -4650,28 +4650,28 @@
<para>
Produce XML output.
</para>
-
+
<para>
<emphasis role="bold">Note</emphasis>: Prior to MySQL
5.0.26, there was no differentiation in the output when
using this option between columns containing the
<literal>NULL</literal> value and columns containing the
string literal <literal>'NULL'</literal>; both were
- represented as
+ represented as
</para>
-
+
<programlisting>
<field name="<replaceable>column_name</replaceable>">NULL</field>
</programlisting>
-
+
<para>
Beginning with MySQL 5.0.26, the output when
<option>--xml</option> is used with
<command>mysql</command> matches that of
<command>mysqldump <option>--xml</option></command>. See
<link linkend="mysqldump-xml-option">the section of the
- Manual which discusses the <option>--xml</option> option
- for <command>mysqldump</command></link> for details.
+ Manual which discusses the <option>--xml</option> option
+ for <command>mysqldump</command></link> for details.
</para>
</listitem>
@@ -11427,10 +11427,10 @@
<para>
Write dump output as well-formed XML.
</para>
-
+
<para>
<emphasis role="bold"><literal>NULL</literal>,
- <literal>'NULL'</literal>, and Empty Values</emphasis>:
+ <literal>'NULL'</literal>, and Empty Values</emphasis>:
For some column named
<replaceable>column_name</replaceable>, the
<literal>NULL</literal> value, an empty string, and the
@@ -11438,7 +11438,7 @@
from one another in the output generated by this option as
follows:
</para>
-
+
<informaltable>
<tgroup cols="2">
<colspec colwidth="50*"/>
@@ -11450,28 +11450,29 @@
</row>
<row>
<entry><literal>NULL</literal> (<emphasis>unknown value</emphasis>)</entry>
- <entry><literal><field name="<replaceable>column_name</replaceable>" xsi:nil="true" /></literal></entry>
+ <entry><literal><field name="<replaceable>column_name</replaceable>"
+ xsi:nil="true" /></literal></entry>
</row>
<row>
<entry><literal>''</literal> (<emphasis>empty string</emphasis>)</entry>
- <entry><literal>>field name="<replaceable>column_name</replaceable>"></field></literal></entry>
+ <entry><literal>>field
+ name="<replaceable>column_name</replaceable>"></field></literal></entry>
</row>
<row>
<entry><literal>'NULL'</literal> (<emphasis>string value</emphasis>)</entry>
- <entry><literal>>field name="<replaceable>column_name</replaceable>">NULL</field></literal></entry>
+ <entry><literal>>field
+ name="<replaceable>column_name</replaceable>">NULL</field></literal></entry>
</row>
</tbody>
</tgroup>
-
</informaltable>
-
+
<para>
Beginning with MySQL 5.0.26, the output from the
<command>mysql</command> client when run using the
<option>--xml</option> option also follows these rules.
(See <xref linkend="mysql-command-options"/>.)
</para>
-
</listitem>
</itemizedlist>
Modified: trunk/refman-5.0/news-5.0.xml
===================================================================
--- trunk/refman-5.0/news-5.0.xml 2006-10-08 06:54:01 UTC (rev 3574)
+++ trunk/refman-5.0/news-5.0.xml 2006-10-08 06:55:16 UTC (rev 3575)
Changed blocks: 1, Lines Added: 9, Lines Deleted: 9; 1502 bytes
@@ -305,37 +305,37 @@
</para>
<itemizedlist>
-
+
<listitem>
<para>
The output generated by the server when using the
<option>--xml</option> option has changed with regard to null
values. It now matches the output from <command>mysqldump
- <option>--xml</option></command>. That is, a column
- containing a <literal>NULL</literal> value is now reported as
+ <option>--xml</option></command>. That is, a column containing
+ a <literal>NULL</literal> value is now reported as
</para>
-
+
<programlisting>
<field name="<replaceable>column_name</replaceable>" xsi:nil="true" />
</programlisting>
-
+
<para>
whereas a column containing the string value
<literal>'NULL'</literal> is reported as
</para>
-
+
<programlisting>
<field name="<replaceable>column_name</replaceable>">NULL</field>
</programlisting>
-
+
<para>
and a column containing an empty string is reported as
</para>
-
+
<programlisting>
<field name="<replaceable>column_name</replaceable>">>/field>
</programlisting>
-
+
<para>
(Bug #21263)
</para>
Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml 2006-10-08 06:54:01 UTC (rev 3574)
+++ trunk/refman-5.1/client-utility-programs.xml 2006-10-08 06:55:16 UTC (rev 3575)
Changed blocks: 4, Lines Added: 16, Lines Deleted: 14; 3977 bytes
@@ -4644,28 +4644,28 @@
<para>
Produce XML output.
</para>
-
+
<para>
<emphasis role="bold">Note</emphasis>: Prior to MySQL
5.1.12, there was no differentiation in the output when
using this option between columns containing the
<literal>NULL</literal> value and columns containing the
string literal <literal>'NULL'</literal>; both were
- represented as
+ represented as
</para>
-
+
<programlisting>
<field name="<replaceable>column_name</replaceable>">NULL</field>
</programlisting>
-
+
<para>
Beginning with MySQL 5.1.12, the output when
<option>--xml</option> is used with
<command>mysql</command> matches that of
<command>mysqldump <option>--xml</option></command>. See
<link linkend="mysqldump-xml-option">the section of the
- Manual which discusses the <option>--xml</option> option
- for <command>mysqldump</command></link> for details.
+ Manual which discusses the <option>--xml</option> option
+ for <command>mysqldump</command></link> for details.
</para>
</listitem>
@@ -11364,10 +11364,10 @@
<para>
Write dump output as well-formed XML.
</para>
-
+
<para>
<emphasis role="bold"><literal>NULL</literal>,
- <literal>'NULL'</literal>, and Empty Values</emphasis>:
+ <literal>'NULL'</literal>, and Empty Values</emphasis>:
For some column named
<replaceable>column_name</replaceable>, the
<literal>NULL</literal> value, an empty string, and the
@@ -11375,7 +11375,7 @@
from one another in the output generated by this option as
follows:
</para>
-
+
<informaltable>
<tgroup cols="2">
<colspec colwidth="50*"/>
@@ -11387,21 +11387,23 @@
</row>
<row>
<entry><literal>NULL</literal> (<emphasis>unknown value</emphasis>)</entry>
- <entry><literal><field name="<replaceable>column_name</replaceable>" xsi:nil="true" /></literal></entry>
+ <entry><literal><field name="<replaceable>column_name</replaceable>"
+ xsi:nil="true" /></literal></entry>
</row>
<row>
<entry><literal>''</literal> (<emphasis>empty string</emphasis>)</entry>
- <entry><literal>>field name="<replaceable>column_name</replaceable>"></field></literal></entry>
+ <entry><literal>>field
+ name="<replaceable>column_name</replaceable>"></field></literal></entry>
</row>
<row>
<entry><literal>'NULL'</literal> (<emphasis>string value</emphasis>)</entry>
- <entry><literal>>field name="<replaceable>column_name</replaceable>">NULL</field></literal></entry>
+ <entry><literal>>field
+ name="<replaceable>column_name</replaceable>">NULL</field></literal></entry>
</row>
</tbody>
</tgroup>
-
</informaltable>
-
+
<para>
Beginning with MySQL 5.1.12, the output from the
<command>mysql</command> client when run using the
Modified: trunk/refman-5.1/news-5.1.xml
===================================================================
--- trunk/refman-5.1/news-5.1.xml 2006-10-08 06:54:01 UTC (rev 3574)
+++ trunk/refman-5.1/news-5.1.xml 2006-10-08 06:55:16 UTC (rev 3575)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 12; 1756 bytes
@@ -268,39 +268,37 @@
Cluster to version 5.1.12 or later.
</para>
</listitem>
-
-
-
+
<listitem>
<para>
The output generated by the server when using the
<option>--xml</option> option has changed with regard to null
values. It now matches the output from <command>mysqldump
- <option>--xml</option></command>. That is, a column
- containing a <literal>NULL</literal> value is now reported as
+ <option>--xml</option></command>. That is, a column containing
+ a <literal>NULL</literal> value is now reported as
</para>
-
+
<programlisting>
<field name="<replaceable>column_name</replaceable>" xsi:nil="true" />
</programlisting>
-
+
<para>
whereas a column containing the string value
<literal>'NULL'</literal> is reported as
</para>
-
+
<programlisting>
<field name="<replaceable>column_name</replaceable>">NULL</field>
</programlisting>
-
+
<para>
and a column containing an empty string is reported as
</para>
-
+
<programlisting>
<field name="<replaceable>column_name</replaceable>">>/field>
</programlisting>
-
+
<para>
(Bug #21263)
</para>
@@ -846,7 +844,7 @@
REPAIR TABLE <replaceable>tbl_name</replaceable> QUICK;
</programlisting>
</listitem>
-
+
<listitem>
<para>
It was possible to provide the
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r3575 - in trunk: refman-5.0 refman-5.1 | jon | 8 Oct |
