Author: paul
Date: 2008-03-14 00:25:53 +0100 (Fri, 14 Mar 2008)
New Revision: 10225
Log:
r29971@frost: paul | 2008-03-13 18:24:09 -0500
Update 6.0 manual to reflect that --master-xxx options have been
removed and CHANGE MASTER options should be used instead.
(Partially done - more changes to come.)
Modified:
trunk/dynamic-docs/changelog/mysqld.xml
trunk/dynamic-docs/command-optvars/mysqld.xml
trunk/refman-6.0/introduction.xml
trunk/refman-6.0/replication-configuration.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:29965
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30059
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:29971
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30059
Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml 2008-03-13 22:38:29 UTC (rev 10224)
+++ trunk/dynamic-docs/changelog/mysqld.xml 2008-03-13 23:25:53 UTC (rev 10225)
Changed blocks: 3, Lines Added: 24, Lines Deleted: 32; 3415 bytes
@@ -63065,67 +63065,67 @@
<listitem>
<para>
- <literal>--master-host</literal>
+ <option>--master-host</option>
</para>
</listitem>
<listitem>
<para>
- <literal>--master-user</literal>
+ <option>--master-user</option>
</para>
</listitem>
<listitem>
<para>
- <literal>--master-password </literal>
+ <option>--master-password </option>
</para>
</listitem>
<listitem>
<para>
- <literal>--master-port</literal>
+ <option>--master-port</option>
</para>
</listitem>
<listitem>
<para>
- <literal>--master-connect-retry</literal>
+ <option>--master-connect-retry</option>
</para>
</listitem>
<listitem>
<para>
- <literal>--master-ssl</literal>
+ <option>--master-ssl</option>
</para>
</listitem>
<listitem>
<para>
- <literal>--master-ssl-ca</literal>
+ <option>--master-ssl-ca</option>
</para>
</listitem>
<listitem>
<para>
- <literal>--master-ssl-capath</literal>
+ <option>--master-ssl-capath</option>
</para>
</listitem>
<listitem>
<para>
- <literal>--master-ssl-cert</literal>
+ <option>--master-ssl-cert</option>
</para>
</listitem>
<listitem>
<para>
- <literal>--master-ssl-cipher</literal>
+ <option>--master-ssl-cipher</option>
</para>
</listitem>
<listitem>
<para>
- <literal>--master-ssl-key</literal>
+ <option>--master-ssl-key</option>
</para>
</listitem>
@@ -77321,7 +77321,19 @@
</entry>
</row>
<row>
- <entry><option>--master-<replaceable>xxx</replaceable></option> options to set replication parameters
+ <entry><option>--master-<replaceable>xxx</replaceable></option>
+options to set replication parameters:
+ <option>--master-host</option>,
+ <option>--master-user</option>,
+ <option>--master-password </option>,
+ <option>--master-port</option>,
+ <option>--master-connect-retry</option>,
+ <option>--master-ssl</option>,
+ <option>--master-ssl-ca</option>,
+ <option>--master-ssl-capath</option>,
+ <option>--master-ssl-cert</option>,
+ <option>--master-ssl-cipher</option>,
+ <option>--master-ssl-key</option>
</entry>
<entry><literal>CHANGE MASTER</literal>
@@ -97068,26 +97080,6 @@
</logentry>
- <logentry entrytype="feature">
-
- <tags>
- <manual type="SSL"/>
- </tags>
-
- <versions>
- <version ver="5.1.17"/>
- </versions>
-
- <message>
-
- <para>
- <literal>--master-ssl</literal>
- </para>
-
- </message>
-
- </logentry>
-
<logentry entrytype="bug">
<bugs>
Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml 2008-03-13 22:38:29 UTC (rev 10224)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml 2008-03-13 23:25:53 UTC (rev 10225)
Changed blocks: 11, Lines Added: 11, Lines Deleted: 11; 2703 bytes
@@ -11625,7 +11625,7 @@
<deprecated version="5.1.17"/>
- <removed version="5.2.0"/>
+ <removed version="5.2.5"/>
<types>
<optype class="cmdline" format="--master-connect-retry=#"/>
@@ -11658,7 +11658,7 @@
<deprecated version="5.1.17"/>
- <removed version="5.2.0"/>
+ <removed version="5.2.5"/>
<types>
<optype class="cmdline" format="--master-host=name" setvar="master-host"/>
@@ -11721,7 +11721,7 @@
<deprecated version="5.1.17"/>
- <removed version="5.2.0"/>
+ <removed version="5.2.5"/>
<types>
<optype class="cmdline" format="--master-password=name" setvar="master-password"/>
@@ -11752,7 +11752,7 @@
<deprecated version="5.1.17"/>
- <removed version="5.2.0"/>
+ <removed version="5.2.5"/>
<types>
<optype class="cmdline" format="--master-port=#" setvar="master-port"/>
@@ -11820,7 +11820,7 @@
<deprecated version="5.1.17"/>
- <removed version="5.2.0"/>
+ <removed version="5.2.5"/>
<types>
<optype class="cmdline" format="--master-ssl" setvar="master-ssl"/>
@@ -11855,7 +11855,7 @@
<deprecated version="5.1.17"/>
- <removed version="5.2.0"/>
+ <removed version="5.2.5"/>
<types>
<optype class="cmdline" format="--master-ssl-ca[=name]" setvar="master-ssl-ca"/>
@@ -11886,7 +11886,7 @@
<deprecated version="5.1.17"/>
- <removed version="5.2.0"/>
+ <removed version="5.2.5"/>
<types>
<optype class="cmdline" format="--master-ssl-capath[=name]" setvar="master-ssl-capath"/>
@@ -11918,7 +11918,7 @@
<deprecated version="5.1.17"/>
- <removed version="5.2.0"/>
+ <removed version="5.2.5"/>
<types>
<optype class="cmdline" format="--master-ssl-cert[=name]" setvar="master-ssl-cert"/>
@@ -11949,7 +11949,7 @@
<deprecated version="5.1.17"/>
- <removed version="5.2.0"/>
+ <removed version="5.2.5"/>
<types>
<optype class="cmdline" format="--master-ssl-cipher[=name]" setvar="master-ssl-cipher"/>
@@ -11981,7 +11981,7 @@
<deprecated version="5.1.17"/>
- <removed version="5.2.0"/>
+ <removed version="5.2.5"/>
<types>
<optype class="cmdline" format="--master-ssl-key[=name]" setvar="master-ssl-key"/>
@@ -12015,7 +12015,7 @@
<deprecated version="5.1.17"/>
- <removed version="5.2.0"/>
+ <removed version="5.2.5"/>
<types>
<optype class="cmdline" format="--master-user=name" setvar="master-user"/>
Modified: trunk/refman-6.0/introduction.xml
===================================================================
--- trunk/refman-6.0/introduction.xml 2008-03-13 22:38:29 UTC (rev 10224)
+++ trunk/refman-6.0/introduction.xml 2008-03-13 23:25:53 UTC (rev 10225)
Changed blocks: 1, Lines Added: 11, Lines Deleted: 1; 1099 bytes
@@ -698,7 +698,17 @@
<para>
The <option>--master-<replaceable>xxx</replaceable></option>
server options to set replication parameters (use the
- <literal>CHANGE MASTER</literal> statement).
+ <literal>CHANGE MASTER</literal> statement instead):
+ <option>--master-host</option>,
+ <option>--master-user</option>, <option>--master-password
+ </option>, <option>--master-port</option>,
+ <option>--master-connect-retry</option>,
+ <option>--master-ssl</option>,
+ <option>--master-ssl-ca</option>,
+ <option>--master-ssl-capath</option>,
+ <option>--master-ssl-cert</option>,
+ <option>--master-ssl-cipher</option>,
+ <option>--master-ssl-key</option>.
</para>
</listitem>
Modified: trunk/refman-6.0/replication-configuration.xml
===================================================================
--- trunk/refman-6.0/replication-configuration.xml 2008-03-13 22:38:29 UTC (rev 10224)
+++ trunk/refman-6.0/replication-configuration.xml 2008-03-13 23:25:53 UTC (rev 10225)
Changed blocks: 6, Lines Added: 21, Lines Deleted: 21; 4028 bytes
@@ -376,8 +376,9 @@
<para>
If you do not specify a <literal>server-id</literal> value, it
- is set to 1 if you have not defined
- <literal>master-host</literal>; otherwise it is set to 2. Note
+ is set to 1 if you have not defined the
+ <literal>MASTER_HOST</literal> option with the <literal>CHANGE
+ MASTER TO</literal> statement; otherwise it is set to 2. Note
that in the case of <literal>server-id</literal> omission, a
master refuses connections from all slaves, and a slave refuses
to connect to a master. Thus, omitting
@@ -1882,13 +1883,11 @@
<important>
<para>
- <emphasis>The use of the following options is
- deprecated</emphasis>. The settings they alter are ignored when
- <command>mysqld</command> is started and a warning is written to
- the <command>mysqld</command> log. To configure replication, you
- must use the <literal>CHANGE MASTER TO ...</literal> statement
- (see <xref linkend="change-master-to"/>). The affected options
- are listed here:
+ <emphasis>The following options were removed in MySQL
+ 5.2.5.</emphasis> To configure replication, you must use the
+ <literal>CHANGE MASTER TO ...</literal> statement (see
+ <xref linkend="change-master-to"/>). The affected options are
+ listed here:
<itemizedlist>
@@ -2002,9 +2001,9 @@
<para>
Because the server gives an existing
<filename>master.info</filename> file precedence over the startup
- options just described, you might prefer not to use startup
- options for these values at all, and instead specify them by using
- the <literal>CHANGE MASTER TO</literal> statement. See
+ options just described, you should not use startup options for
+ these values at all, and instead specify them by using the
+ <literal>CHANGE MASTER TO</literal> statement. See
<xref linkend="change-master-to"/>.
</para>
@@ -2016,7 +2015,6 @@
<programlisting>
[mysqld]
server-id=2
-master-connect-retry=60
report-host=db-slave.mycompany.com
</programlisting>
@@ -2141,10 +2139,11 @@
<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
- are triggered when data reads by the slave time out according
- to the <option>--slave-net-timeout</option> option. The
- default value is 86400.
+ set by the <literal>MASTER_CONNECT_RETRY</literal> option for
+ the <literal>CHANGE MASTER TO</literal> statement 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>
@@ -3052,10 +3051,11 @@
before the slave considers the connection broken, aborts the
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 and the number of reconnection attempts is limited by
- the <option>--master-retry-count</option> option. The default
- is 3600 seconds (one hour).
+ controlled by the <literal>MASTER_CONNECT_RETRY</literal>
+ option for the <literal>CHANGE MASTER TO</literal> statement
+ 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>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r10225 - in trunk: . dynamic-docs/changelog dynamic-docs/command-optvars refman-6.0 | paul | 14 Mar |
