Author: paul
Date: 2009-02-13 01:26:14 +0100 (Fri, 13 Feb 2009)
New Revision: 13724
Log:
r38523@frost: paul | 2009-02-12 15:58:13 -0500
Add auto-link markup
Modified:
trunk/refman-4.1/replication-options-core.xml
trunk/refman-4.1/replication.xml
trunk/refman-4.1/sql-syntax-server-administration.xml
trunk/refman-5.0/optimization.xml
trunk/refman-5.0/replication-implementation.xml
trunk/refman-5.0/replication-notes.xml
trunk/refman-5.0/replication-options-core.xml
trunk/refman-5.0/sql-syntax-server-administration.xml
trunk/refman-5.1-maria/sql-syntax-server-administration.xml
trunk/refman-5.1/optimization.xml
trunk/refman-5.1/replication-notes.xml
trunk/refman-5.1/replication-options-core.xml
trunk/refman-5.1/sql-syntax-server-administration.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:38522
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:38523
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:25:44 UTC (rev 13723)
+++ trunk/refman-4.1/replication-options-core.xml 2009-02-13 00:26:14 UTC (rev 13724)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 1875 bytes
@@ -382,7 +382,7 @@
<listitem>
<para>
- <option>--master-connect-retry</option>
+ <option role="mysqld">--master-connect-retry</option>
</para>
</listitem>
@@ -636,7 +636,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <option>--master-connect-retry=<replaceable>seconds</replaceable></option>
+ <option role="mysqld">--master-connect-retry=<replaceable>seconds</replaceable></option>
</para>
<para>
@@ -763,7 +763,7 @@
The number of times that the slave tries to connect to the
master before giving up. Reconnects are attempted at intervals
set by the <literal role="stmt">CHANGE MASTER TO</literal>
- statement or <option>--master-connect-retry</option> option
+ statement or <option role="mysqld">--master-connect-retry</option> 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.
@@ -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 number
+ <option role="mysqld">--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-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml 2009-02-13 00:25:44 UTC (rev 13723)
+++ trunk/refman-4.1/replication.xml 2009-02-13 00:26:14 UTC (rev 13724)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1193 bytes
@@ -176,7 +176,7 @@
the slave keeps trying to connect periodically until it is able to
resume listening for updates. The <literal role="stmt">CHANGE
MASTER TO</literal> statement or
- <option>--master-connect-retry</option> option controls the retry
+ <option role="mysqld">--master-connect-retry</option> option controls the retry
interval. The default is 60 seconds.
</para>
@@ -2161,7 +2161,7 @@
that fails. The default is to retry every 60 seconds. This may
be changed with the <literal role="stmt">CHANGE MASTER
TO</literal> statement or
- <option>--master-connect-retry</option> option. A slave also
+ <option role="mysqld">--master-connect-retry</option> option. A slave also
is able to deal with network connectivity outages. However,
the slave notices the network outage only after receiving no
data from the master for
Modified: trunk/refman-4.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-server-administration.xml 2009-02-13 00:25:44 UTC (rev 13723)
+++ trunk/refman-4.1/sql-syntax-server-administration.xml 2009-02-13 00:26:14 UTC (rev 13724)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1236 bytes
@@ -5735,7 +5735,7 @@
The number of seconds between connect retries (default 60).
This may be set with the <literal role="stmt">CHANGE MASTER
TO</literal> statement or
- <option>--master-connect-retry</option> option.
+ <option role="mysqld">--master-connect-retry</option> option.
</para>
</listitem>
@@ -6121,7 +6121,7 @@
example if the slave I/O thread is sleeping for the number
of seconds given by the <literal role="stmt">CHANGE MASTER
TO</literal> statement or
- <option>--master-connect-retry</option> option (default 60)
+ <option role="mysqld">--master-connect-retry</option> option (default 60)
before reconnecting, <literal>NULL</literal> is shown, as
the slave cannot know what the master is doing, and so
cannot say reliably how late it is.
Modified: trunk/refman-5.0/optimization.xml
===================================================================
--- trunk/refman-5.0/optimization.xml 2009-02-13 00:25:44 UTC (rev 13723)
+++ trunk/refman-5.0/optimization.xml 2009-02-13 00:26:14 UTC (rev 13724)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1161 bytes
@@ -14498,7 +14498,7 @@
sleeps, then tries to reconnect periodically. The interval
between retries can be specified using the
<literal role="stmt">CHANGE MASTER TO</literal> statement
- or the <option>--master-connect-retry</option> option.
+ or the <option role="mysqld">--master-connect-retry</option> option.
</para>
</listitem>
@@ -14590,7 +14590,7 @@
An error occurred while reading (due to disconnection).
The thread is sleeping for the number of seconds set by
the <literal role="stmt">CHANGE MASTER TO</literal>
- statement or <option>--master-connect-retry</option>
+ statement or <option role="mysqld">--master-connect-retry</option>
option (default 60) before attempting to reconnect.
</para>
</listitem>
Modified: trunk/refman-5.0/replication-implementation.xml
===================================================================
--- trunk/refman-5.0/replication-implementation.xml 2009-02-13 00:25:44 UTC (rev 13723)
+++ trunk/refman-5.0/replication-implementation.xml 2009-02-13 00:26:14 UTC (rev 13724)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 698 bytes
@@ -41,7 +41,7 @@
master fails, or the slave loses connectivity with your master, the
slave keeps trying to connect periodically until it is able to
resume listening for updates. The
- <option>--master-connect-retry</option> option controls the retry
+ <option role="mysqld">--master-connect-retry</option> option controls the retry
interval. The default is 60 seconds.
</para>
Modified: trunk/refman-5.0/replication-notes.xml
===================================================================
--- trunk/refman-5.0/replication-notes.xml 2009-02-13 00:25:44 UTC (rev 13723)
+++ trunk/refman-5.0/replication-notes.xml 2009-02-13 00:26:14 UTC (rev 13724)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 835 bytes
@@ -714,7 +714,7 @@
to reconnect immediately and retries periodically if that fails.
The default is to retry every 60 seconds. This may be changed
with the <literal role="stmt">CHANGE MASTER TO</literal>
- statement or <option>--master-connect-retry</option> option. A
+ statement or <option role="mysqld">--master-connect-retry</option> option. A
slave also is able to deal with network connectivity outages.
However, the slave notices the network outage only after
receiving no data from the master for
Modified: trunk/refman-5.0/replication-options-core.xml
===================================================================
--- trunk/refman-5.0/replication-options-core.xml 2009-02-13 00:25:44 UTC (rev 13723)
+++ trunk/refman-5.0/replication-options-core.xml 2009-02-13 00:26:14 UTC (rev 13724)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 1877 bytes
@@ -682,7 +682,7 @@
<listitem>
<para>
- <option>--master-connect-retry</option>
+ <option role="mysqld">--master-connect-retry</option>
</para>
</listitem>
@@ -928,7 +928,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <option>--master-connect-retry=<replaceable>seconds</replaceable></option>
+ <option role="mysqld">--master-connect-retry=<replaceable>seconds</replaceable></option>
</para>
<para>
@@ -1055,7 +1055,7 @@
The number of times that the slave tries to connect to the
master before giving up. Reconnects are attempted at intervals
set by the <literal role="stmt">CHANGE MASTER TO</literal>
- statement or <option>--master-connect-retry</option> option
+ statement or <option role="mysqld">--master-connect-retry</option> 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.
@@ -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 number
+ <option role="mysqld">--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/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-server-administration.xml 2009-02-13 00:25:44 UTC (rev 13723)
+++ trunk/refman-5.0/sql-syntax-server-administration.xml 2009-02-13 00:26:14 UTC (rev 13724)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1236 bytes
@@ -7171,7 +7171,7 @@
The number of seconds between connect retries (default 60).
This may be set with the <literal role="stmt">CHANGE MASTER
TO</literal> statement or
- <option>--master-connect-retry</option> option.
+ <option role="mysqld">--master-connect-retry</option> option.
</para>
</listitem>
@@ -7538,7 +7538,7 @@
example if the slave I/O thread is sleeping for the number
of seconds given by the <literal role="stmt">CHANGE MASTER
TO</literal> statement or
- <option>--master-connect-retry</option> option (default 60)
+ <option role="mysqld">--master-connect-retry</option> option (default 60)
before reconnecting, <literal>NULL</literal> is shown, as
the slave cannot know what the master is doing, and so
cannot say reliably how late it is.
Modified: trunk/refman-5.1/optimization.xml
===================================================================
--- trunk/refman-5.1/optimization.xml 2009-02-13 00:25:44 UTC (rev 13723)
+++ trunk/refman-5.1/optimization.xml 2009-02-13 00:26:14 UTC (rev 13724)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1161 bytes
@@ -15432,7 +15432,7 @@
sleeps, then tries to reconnect periodically. The interval
between retries can be specified using the
<literal role="stmt">CHANGE MASTER TO</literal> statement
- or the <option>--master-connect-retry</option> option.
+ or the <option role="mysqld">--master-connect-retry</option> option.
</para>
</listitem>
@@ -15524,7 +15524,7 @@
An error occurred while reading (due to disconnection).
The thread is sleeping for the number of seconds set by
the <literal role="stmt">CHANGE MASTER TO</literal>
- statement or <option>--master-connect-retry</option>
+ statement or <option role="mysqld">--master-connect-retry</option>
option (default 60) before attempting to reconnect.
</para>
</listitem>
Modified: trunk/refman-5.1/replication-notes.xml
===================================================================
--- trunk/refman-5.1/replication-notes.xml 2009-02-13 00:25:44 UTC (rev 13723)
+++ trunk/refman-5.1/replication-notes.xml 2009-02-13 00:26:14 UTC (rev 13724)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 837 bytes
@@ -1520,7 +1520,7 @@
to reconnect immediately and retries periodically if that fails.
The default is to retry every 60 seconds. This may be changed
with the <literal role="stmt">CHANGE MASTER TO</literal>
- statement or <option>--master-connect-retry</option> option. A
+ statement or <option role="mysqld">--master-connect-retry</option> option. A
slave also is able to deal with network connectivity outages.
However, the slave notices the network outage only after
receiving no data from the master for
Modified: trunk/refman-5.1/replication-options-core.xml
===================================================================
--- trunk/refman-5.1/replication-options-core.xml 2009-02-13 00:25:44 UTC (rev 13723)
+++ trunk/refman-5.1/replication-options-core.xml 2009-02-13 00:26:14 UTC (rev 13724)
Changed blocks: 5, Lines Added: 5, Lines Deleted: 5; 2350 bytes
@@ -741,7 +741,7 @@
<listitem>
<para>
- <option>--master-connect-retry</option>
+ <option role="mysqld">--master-connect-retry</option>
</para>
</listitem>
@@ -1019,7 +1019,7 @@
<secondary>mysqld</secondary>
</indexterm>
- <option>--master-connect-retry=<replaceable>seconds</replaceable></option>
+ <option role="mysqld">--master-connect-retry=<replaceable>seconds</replaceable></option>
</para>
<para>
@@ -1165,7 +1165,7 @@
<para>
The number of times that the slave tries to connect to the
master before giving up. Reconnects are attempted at intervals
- set by <option>--master-connect-retry</option> and reconnects
+ set by <option role="mysqld">--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.
@@ -1174,7 +1174,7 @@
<note>
<para>
The <command>mysqld</command> option
- <option>--master-connect-retry</option> is deprecated as of
+ <option role="mysqld">--master-connect-retry</option> is deprecated as of
MySQL 5.1.17, and removed in MySQL 5.2.5 and later. You
should use the <literal>MASTER_CONNECT_RETRY</literal>
option for the <literal role="stmt">CHANGE MASTER
@@ -2219,7 +2219,7 @@
immediately after the timeout. The interval between retries is
controlled by the <literal>MASTER_CONNECT_RETRY</literal>
option for the <literal role="stmt">CHANGE MASTER TO</literal>
- statement or <option>--master-connect-retry</option> option,
+ statement or <option role="mysqld">--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.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-server-administration.xml 2009-02-13 00:25:44 UTC (rev 13723)
+++ trunk/refman-5.1/sql-syntax-server-administration.xml 2009-02-13 00:26:14 UTC (rev 13724)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1236 bytes
@@ -8150,7 +8150,7 @@
The number of seconds between connect retries (default 60).
This may be set with the <literal role="stmt">CHANGE MASTER
TO</literal> statement or
- <option>--master-connect-retry</option> option.
+ <option role="mysqld">--master-connect-retry</option> option.
</para>
</listitem>
@@ -8515,7 +8515,7 @@
example if the slave I/O thread is sleeping for the number
of seconds given by the <literal role="stmt">CHANGE MASTER
TO</literal> statement or
- <option>--master-connect-retry</option> option (default 60)
+ <option role="mysqld">--master-connect-retry</option> option (default 60)
before reconnecting, <literal>NULL</literal> is shown, as
the slave cannot know what the master is doing, and so
cannot say reliably how late it is.
Modified: trunk/refman-5.1-maria/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1-maria/sql-syntax-server-administration.xml 2009-02-13 00:25:44 UTC (rev 13723)
+++ trunk/refman-5.1-maria/sql-syntax-server-administration.xml 2009-02-13 00:26:14 UTC (rev 13724)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1254 bytes
@@ -8231,7 +8231,7 @@
The number of seconds between connect retries (default 60).
This may be set with the <literal role="stmt">CHANGE MASTER
TO</literal> statement or
- <option>--master-connect-retry</option> option.
+ <option role="mysqld">--master-connect-retry</option> option.
</para>
</listitem>
@@ -8596,7 +8596,7 @@
example if the slave I/O thread is sleeping for the number
of seconds given by the <literal role="stmt">CHANGE MASTER
TO</literal> statement or
- <option>--master-connect-retry</option> option (default 60)
+ <option role="mysqld">--master-connect-retry</option> option (default 60)
before reconnecting, <literal>NULL</literal> is shown, as
the slave cannot know what the master is doing, and so
cannot say reliably how late it is.
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r13724 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.1-maria | paul.dubois | 13 Feb |
