Author: paul
Date: 2009-02-13 01:25:44 +0100 (Fri, 13 Feb 2009)
New Revision: 13723
Log:
r38522@frost: paul | 2009-02-12 15:54:04 -0500
Add ID, fix typo
Modified:
trunk/refman-4.1/replication-options-core.xml
trunk/refman-5.0/replication-options-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:41755
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:38520
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:36139
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:41755
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:38522
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:36139
Modified: trunk/refman-4.1/replication-options-core.xml
===================================================================
--- trunk/refman-4.1/replication-options-core.xml 2009-02-13 00:15:14 UTC (rev 13722)
+++ trunk/refman-4.1/replication-options-core.xml 2009-02-13 00:25:44 UTC (rev 13723)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1036 bytes
@@ -625,7 +625,7 @@
</listitem>
<listitem>
- <para>
+ <para id="option_mysqld_master-connect-retry">
<indexterm>
<primary>mysqld</primary>
<secondary>master-connect-retry option</secondary>
@@ -1712,7 +1712,7 @@
immediately after the timeout. The interval between retries is
controlled by the <literal role="stmt">CHANGE MASTER
TO</literal> statement or
- <option>--master-connect-retry</option> option and the numger
+ <option>--master-connect-retry</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).
Modified: trunk/refman-5.0/replication-options-core.xml
===================================================================
--- trunk/refman-5.0/replication-options-core.xml 2009-02-13 00:15:14 UTC (rev 13722)
+++ trunk/refman-5.0/replication-options-core.xml 2009-02-13 00:25:44 UTC (rev 13723)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1036 bytes
@@ -917,7 +917,7 @@
</listitem>
<listitem>
- <para>
+ <para id="option_mysqld_master-connect-retry">
<indexterm>
<primary>mysqld</primary>
<secondary>master-connect-retry option</secondary>
@@ -2018,7 +2018,7 @@
immediately after the timeout. The interval between retries is
controlled by the <literal role="stmt">CHANGE MASTER
TO</literal> statement or
- <option>--master-connect-retry</option> option and the numger
+ <option>--master-connect-retry</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).
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r13723 - in trunk: . refman-4.1 refman-5.0 | paul.dubois | 13 Feb |
