svn commit - mysqldoc@docsrva: r1224 - in trunk: . refman-4.1 refman-5.0 refman-5.1

[paul]

Author: paul
Date: 2006-02-07 18:49:23 +0100 (Tue, 07 Feb 2006)
New Revision: 1224

Log:
 r2879@kite-hub:  paul | 2006-02-06 13:54:43 -0600
 Update --log-warnings description.


Modified:
   trunk/
   trunk/refman-4.1/database-administration.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.1/database-administration.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7186
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2877
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7186
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2879

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-02-07 04:02:01 UTC (rev 1223)
+++ trunk/refman-4.1/database-administration.xml	2006-02-07 17:49:23 UTC (rev 1224)
@@ -1119,7 +1119,8 @@
 
           <listitem>
             <para>
-              <option>--log-warnings</option>,
<option>-W</option>
+             
<option>--log-warnings=[<replaceable>level</replaceable>]</option>,
+              <option>-W
[<replaceable>level</replaceable>]</option>
             </para>
 
             <para>
@@ -1129,15 +1130,19 @@
               (you get more information about what is happening, such as
               messages about network failures and reconnections). This
               option is enabled by default as of MySQL 4.0.19 and 4.1.2;
-              to disable it, use <option>--skip-log-warnings</option>.
-              As of MySQL 4.0.21 and 4.1.3, aborted connections are not
-              logged to the error log unless the value is greater than
-              1. See <xref linkend="communication-errors"/>.
+              to disable it, use <option>--log-warnings=0</option>. As
+              of MySQL 4.0.21 and 4.1.3, a
+              <replaceable>level</replaceable> argument can be given. If
+              omitted, the default <replaceable>level</replaceable> is
+              1. Aborted connections are not logged to the error log
+              unless the value is greater than 1. See
+              <xref linkend="communication-errors"/>.
             </para>
 
             <para>
-              This option was named <option>--warnings</option> before
-              MySQL 4.0.
+              Before MySQL 4.0.21 and 4.1.3, this is a boolean option,
+              not an integer-valued option. Before 4.0, this option was
+              named <option>--warnings</option>.
             </para>
           </listitem>
 
@@ -3506,8 +3511,9 @@
               Whether to produce additional warning messages. This
               variable was added in MySQL 4.0.3. It is enabled by
               default as of MySQL 4.0.19 and 4.1.2. As of MySQL 4.0.21
-              and 4.1.3, aborted connections are not logged to the error
-              log unless the value is greater than 1.
+              and 4.1.3, the variable can take values greater than 1 and
+              aborted connections are not logged to the error log unless
+              the value is greater than 1.
             </para>
           </listitem>
 
@@ -12307,8 +12313,8 @@
 </programlisting>
 
       <para>
-        Alternative forms of the <option>-h</option>,
<option>-u</option>,
-        and <option>-p</option> options are
+        Alternative forms of the <option>-h</option>,
+        <option>-u</option>, and <option>-p</option> options are
        
<option>--host=<replaceable>host_name</replaceable></option>,
        
<option>--user=<replaceable>user_name</replaceable></option>,
         and

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-02-07 04:02:01 UTC (rev 1223)
+++ trunk/refman-5.0/database-administration.xml	2006-02-07 17:49:23 UTC (rev 1224)
@@ -1171,7 +1171,8 @@
 
           <listitem>
             <para>
-              <option>--log-warnings</option>,
<option>-W</option>
+             
<option>--log-warnings=[<replaceable>level</replaceable>]</option>,
+              <option>-W
[<replaceable>level</replaceable>]</option>
             </para>
 
             <para>
@@ -1180,11 +1181,12 @@
               option is recommended, for example, if you use replication
               (you get more information about what is happening, such as
               messages about network failures and reconnections). This
-              option is enabled by default; to disable it, use
-              <option>--skip-log-warnings</option>. Aborted connections
-              are not logged to the error log unless the value is
-              greater than 1. See
-              <xref linkend="communication-errors"/>.
+              option is enabled (1) by default, and the default
+              <replaceable>level</replaceable> value if omitted is 1. To
+              disable this option, use
+              <option>--log-warnings=0</option>. Aborted connections are
+              not logged to the error log unless the value is greater
+              than 1. See <xref linkend="communication-errors"/>.
             </para>
           </listitem>
 
@@ -3774,8 +3776,8 @@
 
             <para>
               Whether to produce additional warning messages. It is
-              enabled by default. Aborted connections are not logged to
-              the error log unless the value is greater than 1.
+              enabled (1) by default. Aborted connections are not logged
+              to the error log unless the value is greater than 1.
             </para>
           </listitem>
 
@@ -14429,8 +14431,8 @@
 </programlisting>
 
       <para>
-        Alternative forms of the <option>-h</option>,
<option>-u</option>,
-        and <option>-p</option> options are
+        Alternative forms of the <option>-h</option>,
+        <option>-u</option>, and <option>-p</option> options are
        
<option>--host=<replaceable>host_name</replaceable></option>,
        
<option>--user=<replaceable>user_name</replaceable></option>,
         and

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-02-07 04:02:01 UTC (rev 1223)
+++ trunk/refman-5.1/database-administration.xml	2006-02-07 17:49:23 UTC (rev 1224)
@@ -1190,7 +1190,8 @@
 
           <listitem>
             <para>
-              <option>--log-warnings</option>,
<option>-W</option>
+             
<option>--log-warnings=[<replaceable>level</replaceable>]</option>,
+              <option>-W
[<replaceable>level</replaceable>]</option>
             </para>
 
             <para>
@@ -1199,11 +1200,12 @@
               option is recommended, for example, if you use replication
               (you get more information about what is happening, such as
               messages about network failures and reconnections). This
-              option is enabled by default; to disable it, use
-              <option>--skip-log-warnings</option>. Aborted connections
-              are not logged to the error log unless the value is
-              greater than 1. See
-              <xref linkend="communication-errors"/>.
+              option is enabled (1) by default, and the default
+              <replaceable>level</replaceable> value if omitted is 1. To
+              disable this option, use
+              <option>--log-warnings=0</option>. Aborted connections are
+              not logged to the error log unless the value is greater
+              than 1. See <xref linkend="communication-errors"/>.
             </para>
           </listitem>
 
@@ -3858,8 +3860,8 @@
 
             <para>
               Whether to produce additional warning messages. It is
-              enabled by default. Aborted connections are not logged to
-              the error log unless the value is greater than 1.
+              enabled (1) by default. Aborted connections are not logged
+              to the error log unless the value is greater than 1.
             </para>
           </listitem>
 
@@ -14534,8 +14536,8 @@
 </programlisting>
 
       <para>
-        Alternative forms of the <option>-h</option>,
<option>-u</option>,
-        and <option>-p</option> options are
+        Alternative forms of the <option>-h</option>,
+        <option>-u</option>, and <option>-p</option> options are
        
<option>--host=<replaceable>host_name</replaceable></option>,
        
<option>--user=<replaceable>user_name</replaceable></option>,
         and