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

[mcbrown]

Author: mcbrown
Date: 2006-08-16 17:35:26 +0200 (Wed, 16 Aug 2006)
New Revision: 3040

Log:
Updating the default values (Docs Bug #21518). 

This lead to a discussion with Lars/Mats on some other values. I've also now made the
connection between master-retry-connect, slave-net-timeout and master-retry-count clearer
in each section. 



Modified:
   trunk/refman-4.1/replication.xml
   trunk/refman-5.0/replication.xml
   trunk/refman-5.1/replication.xml


Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml	2006-08-16 14:54:01 UTC (rev 3039)
+++ trunk/refman-4.1/replication.xml	2006-08-16 15:35:26 UTC (rev 3040)
Changed blocks: 5, Lines Added: 16, Lines Deleted: 7; 2536 bytes

@@ -2693,9 +2693,12 @@
           trying to reconnect to the master in case the master goes down
           or the connection is lost. The value in the
           <filename>master.info</filename> file takes precedence if it
-          can be read. If not set, the default is 60.  Connection retries
-          are not invoked until the slave reaches the
-          <option>--slave-net-timeout</option>.
+          can be read. If not set, the default is 60. Connection retries
+          are not invoked until the slave times out reading data from
+          the master according to the value of
+          <option>--slave-net-timeout</option>. The number of
+          reconnection attempts is limited by the
+          <option>--master-retry-count</option> option.
         </para>
       </listitem>
 

@@ -2807,7 +2810,11 @@
 
         <para>
           The number of times that the slave tries to connect to the
-          master before giving up.
+          master before giving up. Reconnects are attempted at intervals
+          set by <option>--master-connect-retry</option> and reconnects
+          are triggered when data reads by the slave time out according
+          to the <option>--slave-net-timeout</option> option. The
+          default value is 86400.
         </para>
       </listitem>
 

@@ -2946,7 +2953,7 @@
         <para>
           The size at which the server rotates relay log files
           automatically. For more information, see
-          <xref linkend="slave-logs"/>.
+          <xref linkend="slave-logs"/>. Default is 1GB.
         </para>
 
         <para>

@@ -3582,7 +3589,7 @@
         <para>
           If this option is set to 1, use compression for the
           slave/master protocol if both the slave and the master support
-          it.
+          it. Default is 0 (no compression).
         </para>
       </listitem>
 

@@ -3649,7 +3656,9 @@
           read, and tries to reconnect. The first retry occurs
           immediately after the timeout. The interval between retries is
           controlled by the <option>--master-connect-retry</option>
-          option.
+          option and the numger of reconnection attempts is limited by
+          the <option>--master-retry-count</option> option. The default
+          is 3600 seconds (one hour).
         </para>
       </listitem>
 


Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml	2006-08-16 14:54:01 UTC (rev 3039)
+++ trunk/refman-5.0/replication.xml	2006-08-16 15:35:26 UTC (rev 3040)
Changed blocks: 5, Lines Added: 16, Lines Deleted: 7; 2552 bytes

@@ -2624,9 +2624,12 @@
           trying to reconnect to the master in case the master goes down
           or the connection is lost. The value in the
           <filename>master.info</filename> file takes precedence if it
-          can be read. If not set, the default is 60.  Connection retries
-          are not invoked until the slave reaches the
-          <option>--slave-net-timeout</option>.
+          can be read. If not set, the default is 60. Connection retries
+          are not invoked until the slave times out reading data from
+          the master according to the value of
+          <option>--slave-net-timeout</option>. The number of
+          reconnection attempts is limited by the
+          <option>--master-retry-count</option> option.
         </para>
       </listitem>
 

@@ -2738,7 +2741,11 @@
 
         <para>
           The number of times that the slave tries to connect to the
-          master before giving up.
+          master before giving up. Reconnects are attempted at intervals
+          set by <option>--master-connect-retry</option> and reconnects
+          are triggered when data reads by the slave time out according
+          to the <option>--slave-net-timeout</option> option. The
+          default value is 86400.
         </para>
       </listitem>
 

@@ -2872,7 +2879,7 @@
         <para>
           The size at which the server rotates relay log files
           automatically. For more information, see
-          <xref linkend="slave-logs"/>.
+          <xref linkend="slave-logs"/>. The default size is 1GB.
         </para>
       </listitem>
 

@@ -3487,7 +3494,7 @@
         <para>
           If this option is set to 1, use compression for the
           slave/master protocol if both the slave and the master support
-          it.
+          it. The default is 0 (no compression).
         </para>
       </listitem>
 

@@ -3554,7 +3561,9 @@
           read, and tries to reconnect. The first retry occurs
           immediately after the timeout. The interval between retries is
           controlled by the <option>--master-connect-retry</option>
-          option.
+          option and the number of reconnection attempts is limited by
+          the <option>--master-retry-count</option> option. The default
+          is 3600 seconds (one hour).
         </para>
       </listitem>
 


Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml	2006-08-16 14:54:01 UTC (rev 3039)
+++ trunk/refman-5.1/replication.xml	2006-08-16 15:35:26 UTC (rev 3040)
Changed blocks: 5, Lines Added: 16, Lines Deleted: 7; 2553 bytes

@@ -2835,9 +2835,12 @@
           trying to reconnect to the master in case the master goes down
           or the connection is lost. The value in the
           <filename>master.info</filename> file takes precedence if it
-          can be read. If not set, the default is 60. Connection retries 
-          are not invoked until the slave reaches the 
-          <option>--slave-net-timeout</option>.
+          can be read. If not set, the default is 60. Connection retries
+          are not invoked until the slave times out reading data from
+          the master according to the value of
+          <option>--slave-net-timeout</option>. The number of
+          reconnection attempts is limited by the
+          <option>--master-retry-count</option> option.
         </para>
       </listitem>
 

@@ -2949,7 +2952,11 @@
 
         <para>
           The number of times that the slave tries to connect to the
-          master before giving up.
+          master before giving up. Reconnects are attempted at intervals
+          set by <option>--master-connect-retry</option> and reconnects
+          are triggered when data reads by the slave time out according
+          to the <option>--slave-net-timeout</option> option. The
+          default value is 86400.
         </para>
       </listitem>
 

@@ -3083,7 +3090,7 @@
         <para>
           The size at which the server rotates relay log files
           automatically. For more information, see
-          <xref linkend="slave-logs"/>.
+          <xref linkend="slave-logs"/>. The default size is 1GB.
         </para>
       </listitem>
 

@@ -3698,7 +3705,7 @@
         <para>
           If this option is set to 1, use compression for the
           slave/master protocol if both the slave and the master support
-          it.
+          it. The default is 0 (no compression).
         </para>
       </listitem>
 

@@ -3765,7 +3772,9 @@
           read, and tries to reconnect. The first retry occurs
           immediately after the timeout. The interval between retries is
           controlled by the <option>--master-connect-retry</option>
-          option.
+          option and the number of reconnection attempts is limited by
+          the <option>--master-retry-count</option> option. The default
+          is 3600 seconds (one hour).
         </para>
       </listitem>