Author: paul
Date: 2005-11-15 20:14:47 +0100 (Tue, 15 Nov 2005)
New Revision: 341
Log:
r1030@kite-hub: paul | 2005-11-15 13:08:47 -0600
Fix out-of-order SET option.
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:3733
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1027
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:3733
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1030
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2005-11-15 18:53:55 UTC (rev 340)
+++ trunk/refman-4.1/sql-syntax.xml 2005-11-15 19:14:47 UTC (rev 341)
@@ -12641,23 +12641,6 @@
<listitem>
<para>
- <literal>SQL_NOTES = {0 | 1}</literal>
- </para>
-
- <para>
- When set to <literal>1</literal> (the default), warnings of
- <literal>Note</literal> level are recorded. When set to
- <literal>0</literal>, <literal>Note</literal> warnings are
- suppressed. <command>mysqldump</command> includes output to
- set this variable to <literal>0</literal> so that reloading
- the dump file does not produce warnings for events that do
- not affect the integrity of the reload operation.
- <literal>SQL_NOTES</literal> was added in MySQL 4.1.11.
- </para>
- </listitem>
-
- <listitem>
- <para>
<literal>SQL_AUTO_IS_NULL = {0 | 1}</literal>
</para>
@@ -12757,6 +12740,23 @@
<listitem>
<para>
+ <literal>SQL_NOTES = {0 | 1}</literal>
+ </para>
+
+ <para>
+ When set to <literal>1</literal> (the default), warnings of
+ <literal>Note</literal> level are recorded. When set to
+ <literal>0</literal>, <literal>Note</literal> warnings are
+ suppressed. <command>mysqldump</command> includes output to
+ set this variable to <literal>0</literal> so that reloading
+ the dump file does not produce warnings for events that do
+ not affect the integrity of the reload operation.
+ <literal>SQL_NOTES</literal> was added in MySQL 4.1.11.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<literal>SQL_QUOTE_SHOW_CREATE = {0 | 1}</literal>
</para>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2005-11-15 18:53:55 UTC (rev 340)
+++ trunk/refman-5.0/sql-syntax.xml 2005-11-15 19:14:47 UTC (rev 341)
@@ -13901,23 +13901,6 @@
<listitem>
<para>
- <literal>SQL_NOTES = {0 | 1}</literal>
- </para>
-
- <para>
- When set to <literal>1</literal> (the default), warnings of
- <literal>Note</literal> level are recorded. When set to
- <literal>0</literal>, <literal>Note</literal> warnings are
- suppressed. <command>mysqldump</command> includes output to
- set this variable to <literal>0</literal> so that reloading
- the dump file does not produce warnings for events that do
- not affect the integrity of the reload operation.
- <literal>SQL_NOTES</literal> was added in MySQL 5.0.3.
- </para>
- </listitem>
-
- <listitem>
- <para>
<literal>SQL_AUTO_IS_NULL = {0 | 1}</literal>
</para>
@@ -14013,6 +13996,23 @@
<listitem>
<para>
+ <literal>SQL_NOTES = {0 | 1}</literal>
+ </para>
+
+ <para>
+ When set to <literal>1</literal> (the default), warnings of
+ <literal>Note</literal> level are recorded. When set to
+ <literal>0</literal>, <literal>Note</literal> warnings are
+ suppressed. <command>mysqldump</command> includes output to
+ set this variable to <literal>0</literal> so that reloading
+ the dump file does not produce warnings for events that do
+ not affect the integrity of the reload operation.
+ <literal>SQL_NOTES</literal> was added in MySQL 5.0.3.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<literal>SQL_QUOTE_SHOW_CREATE = {0 | 1}</literal>
</para>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2005-11-15 18:53:55 UTC (rev 340)
+++ trunk/refman-5.1/sql-syntax.xml 2005-11-15 19:14:47 UTC (rev 341)
@@ -14375,22 +14375,6 @@
<listitem>
<para>
- <literal>SQL_NOTES = {0 | 1}</literal>
- </para>
-
- <para>
- When set to <literal>1</literal> (the default), warnings of
- <literal>Note</literal> level are recorded. When set to
- <literal>0</literal>, <literal>Note</literal> warnings are
- suppressed. <command>mysqldump</command> includes output to
- set this variable to <literal>0</literal> so that reloading
- the dump file does not produce warnings for events that do
- not affect the integrity of the reload operation.
- </para>
- </listitem>
-
- <listitem>
- <para>
<literal>SQL_AUTO_IS_NULL = {0 | 1}</literal>
</para>
@@ -14486,6 +14470,22 @@
<listitem>
<para>
+ <literal>SQL_NOTES = {0 | 1}</literal>
+ </para>
+
+ <para>
+ When set to <literal>1</literal> (the default), warnings of
+ <literal>Note</literal> level are recorded. When set to
+ <literal>0</literal>, <literal>Note</literal> warnings are
+ suppressed. <command>mysqldump</command> includes output to
+ set this variable to <literal>0</literal> so that reloading
+ the dump file does not produce warnings for events that do
+ not affect the integrity of the reload operation.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<literal>SQL_QUOTE_SHOW_CREATE = {0 | 1}</literal>
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r341 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 15 Nov |
