Author: paul
Date: 2008-03-14 18:35:43 +0100 (Fri, 14 Mar 2008)
New Revision: 10231
Log:
r29982@frost: paul | 2008-03-14 09:37:19 -0500
stronger wording about using CHANGE MASTER
Modified:
trunk/refman-5.1/replication-configuration.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:29976
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:29982
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30059
Modified: trunk/refman-5.1/replication-configuration.xml
===================================================================
--- trunk/refman-5.1/replication-configuration.xml 2008-03-14 11:27:54 UTC (rev 10230)
+++ trunk/refman-5.1/replication-configuration.xml 2008-03-14 17:35:43 UTC (rev 10231)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 5; 1332 bytes
@@ -1920,15 +1920,17 @@
<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,
+ <emphasis>As of MySQL 5.1.17 and later the use of these
+ options is deprecated and will be removed in MySQL
+ 5.2.</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 the replication parameters associated with these
you must use the <literal>CHANGE MASTER TO ...</literal>
statement (see <xref linkend="change-master-to"/>).
</para>
</listitem>
+options,
</itemizedlist>
</para>
Modified: trunk/refman-6.0/replication-configuration.xml
===================================================================
--- trunk/refman-6.0/replication-configuration.xml 2008-03-14 11:27:54 UTC (rev 10230)
+++ trunk/refman-6.0/replication-configuration.xml 2008-03-14 17:35:43 UTC (rev 10231)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 761 bytes
@@ -1884,7 +1884,8 @@
<important>
<para>
<emphasis>The following options were removed in MySQL
- 5.2.5.</emphasis> To configure replication, you must use the
+ 5.2.5.</emphasis> To configure the replication parameters
+ formerly associated with these options, you must use the
<literal>CHANGE MASTER TO ...</literal> statement (see
<xref linkend="change-master-to"/>). The affected options are
listed here:
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r10231 - in trunk: . refman-5.1 refman-6.0 | paul | 14 Mar |
