Author: jstephens
Date: 2008-02-04 14:44:56 +0100 (Mon, 04 Feb 2008)
New Revision: 9692
Log:
Fixes Docs Bug #34111 (make it clear that --master-* options behaviour
changes, then is deprecated in 5.0/5.1/6.0)
Modified:
trunk/refman-5.0/replication-configuration.xml
trunk/refman-5.1/replication-configuration.xml
trunk/refman-6.0/replication-configuration.xml
Modified: trunk/refman-5.0/replication-configuration.xml
===================================================================
--- trunk/refman-5.0/replication-configuration.xml 2008-02-04 00:15:06 UTC (rev 9691)
+++ trunk/refman-5.0/replication-configuration.xml 2008-02-04 13:44:56 UTC (rev 9692)
Changed blocks: 1, Lines Added: 65, Lines Deleted: 64; 3815 bytes
@@ -1316,83 +1316,84 @@
binary logging are described in <xref linkend="binary-log"/>.
</para>
- <para>
- Some slave server replication options are handled in a special
- way, in the sense that each is ignored if a
- <filename>master.info</filename> file exists when the slave starts
- and contains a value for the option. The following options are
- handled this way:
- </para>
+ <important>
+ <para>
+ Some slave server replication options are ignored if a
+ <filename>master.info</filename> file exists when the slave
+ starts and contains a value for the option. The following
+ options are handled this way:
- <itemizedlist>
+ <itemizedlist>
- <listitem>
- <para>
- <option>--master-host</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-host</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-user</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-user</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-password</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-password</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-port</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-port</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-connect-retry</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-connect-retry</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-ssl</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-ssl</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-ssl-ca</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-ssl-ca</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-ssl-capath</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-ssl-capath</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-ssl-cert</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-ssl-cert</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-ssl-cipher</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-ssl-cipher</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-ssl-key</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-ssl-key</option>
+ </para>
+ </listitem>
- </itemizedlist>
+ </itemizedlist>
+ </para>
+ </important>
<para>
The <filename>master.info</filename> file format in MySQL
Modified: trunk/refman-5.1/replication-configuration.xml
===================================================================
--- trunk/refman-5.1/replication-configuration.xml 2008-02-04 00:15:06 UTC (rev 9691)
+++ trunk/refman-5.1/replication-configuration.xml 2008-02-04 13:44:56 UTC (rev 9692)
Changed blocks: 1, Lines Added: 96, Lines Deleted: 79; 5974 bytes
@@ -1896,101 +1896,118 @@
binary logging are described in <xref linkend="binary-log"/>.
</para>
- <para>
- Certain options are handled in a special way in order to ensure
- that the active replication configuration is not inadvertently
- altered or affected. The options affected are shown in this list:
- </para>
+ <important>
+ <para>
+ Certain options are handled in a special way in order to ensure
+ that the active replication configuration is not inadvertently
+ altered or affected:
- <itemizedlist>
+ <itemizedlist>
- <listitem>
- <para>
- <option>--master-host</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ In MySQL 5.1.16 and earlier, these options are ignored if
+ the <filename>master.info</filename> file exists (i.e.
+ when the MySQL server has already previously been
+ configured for replication). If the file exists and these
+ options are present in the <filename>my.cnf</filename> or
+ as options on the command line to
+ <command>mysqld</command>, they will be silently ignored
+ and the information in <filename>master.info</filename>
+ used instead.
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-user</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <emphasis>In MySQL 5.1.17 and later the use of these
+ options is deprecated.</emphasis> The settings they alter
+ are ignored when <command>mysqld</command> is started and
+ a warning will be provided in the
+ <command>mysqld</command> log. To configure replication,
+ you must use the <literal>CHANGE MASTER TO ...</literal>
+ statement (see <xref linkend="change-master-to"/>).
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-password</option>
- </para>
- </listitem>
+ </itemizedlist>
+ </para>
- <listitem>
- <para>
- <option>--master-port</option>
- </para>
- </listitem>
+ <para>
+ The options affected are shown in this list:
- <listitem>
- <para>
- <option>--master-connect-retry</option>
- </para>
- </listitem>
+ <itemizedlist>
- <listitem>
- <para>
- <option>--master-ssl</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-host</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-ssl-ca</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-user</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-ssl-capath</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-password</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-ssl-cert</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-port</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-ssl-cipher</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-connect-retry</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-ssl-key</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-ssl</option>
+ </para>
+ </listitem>
- </itemizedlist>
+ <listitem>
+ <para>
+ <option>--master-ssl-ca</option>
+ </para>
+ </listitem>
- <para>
- <emphasis>In MySQL 5.1.17 and later the use of these options is
- deprecated.</emphasis> The settings they alter are ignored when
- <command>mysqld</command> is started and a warning will be
- provided in the <command>mysqld</command> log. To configure
- replication, you must use the <literal>CHANGE MASTER TO
- ...</literal> statement.
- </para>
+ <listitem>
+ <para>
+ <option>--master-ssl-capath</option>
+ </para>
+ </listitem>
- <para>
- In MySQL 5.1.16 and earlier, these options are ignored if the
- <filename>master.info</filename> file exists (i.e. when the MySQL
- server has already previously been configured for replication). If
- the file exists and these options are present in the
- <filename>my.cnf</filename> or as options on the command line to
- <command>mysqld</command>, they will be silently ignored and the
- information in <filename>master.info</filename> used instead.
- </para>
+ <listitem>
+ <para>
+ <option>--master-ssl-cert</option>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <option>--master-ssl-cipher</option>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <option>--master-ssl-key</option>
+ </para>
+ </listitem>
+
+ </itemizedlist>
+ </para>
+ </important>
+
<para>
The <filename>master.info</filename> file format in MySQL
¤t-series; includes values corresponding to the SSL options.
Modified: trunk/refman-6.0/replication-configuration.xml
===================================================================
--- trunk/refman-6.0/replication-configuration.xml 2008-02-04 00:15:06 UTC (rev 9691)
+++ trunk/refman-6.0/replication-configuration.xml 2008-02-04 13:44:56 UTC (rev 9692)
Changed blocks: 1, Lines Added: 68, Lines Deleted: 70; 4447 bytes
@@ -1880,91 +1880,89 @@
binary logging are described in <xref linkend="binary-log"/>.
</para>
- <para>
- Certain options are handled in a special way in order to ensure
- that the active replication configuration is not inadvertently
- altered or affected. The options affected are shown in this list:
- </para>
+ <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:
- <itemizedlist>
+ <itemizedlist>
- <listitem>
- <para>
- <option>--master-host</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-host</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-user</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-user</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-password</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-password</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-port</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-port</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-connect-retry</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-connect-retry</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-ssl</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-ssl</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-ssl-ca</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-ssl-ca</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-ssl-capath</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-ssl-capath</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-ssl-cert</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-ssl-cert</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-ssl-cipher</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-ssl-cipher</option>
+ </para>
+ </listitem>
- <listitem>
- <para>
- <option>--master-ssl-key</option>
- </para>
- </listitem>
+ <listitem>
+ <para>
+ <option>--master-ssl-key</option>
+ </para>
+ </listitem>
- </itemizedlist>
+ </itemizedlist>
+ </para>
+ </important>
<para>
- <emphasis>The use of these options is deprecated.</emphasis> The
- settings they alter are ignored when <command>mysqld</command> is
- started and a warning will be provided in the
- <command>mysqld</command> log. To configure replication, you must
- use the <literal>CHANGE MASTER TO ...</literal> statement.
- </para>
-
- <para>
The <filename>master.info</filename> file format in MySQL
¤t-series; includes values corresponding to the SSL options.
In addition, the file format includes as its first line the number
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r9692 - in trunk: refman-5.0 refman-5.1 refman-6.0 | jon | 4 Feb |
