svn commit - mysqldoc@docsrva: r11506 - in trunk: refman-5.1 refman-6.0

[jon]

Author: jstephens
Date: 2008-08-06 10:26:34 +0200 (Wed, 06 Aug 2008)
New Revision: 11506

Log:

Wording fixes; clarified removal of --master-* options



Modified:
   trunk/refman-5.1/replication-configuration.xml
   trunk/refman-6.0/replication-configuration.xml


Modified: trunk/refman-5.1/replication-configuration.xml
===================================================================
--- trunk/refman-5.1/replication-configuration.xml	2008-08-05 22:52:01 UTC (rev 11505)
+++ trunk/refman-5.1/replication-configuration.xml	2008-08-06 08:26:34 UTC (rev 11506)
Changed blocks: 1, Lines Added: 12, Lines Deleted: 11; 2122 bytes

@@ -2166,22 +2166,23 @@
               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.
+              <command>mysqld</command>, they are silently ignored and
+              the information in <filename>master.info</filename> used
+              instead.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <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"/>).
+              <emphasis>Beginning with MySQL 5.1.17, these options are
+              deprecated. Beginning with MySQL 5.2.5, they have been
+              removed.</emphasis> In MySQL 5.1.17 and later versions of
+              MySQL 5.1, these options have no effect when
+              <command>mysqld</command> is started and an appropriate
+              warning is written to the error log. To set the
+              replication parameters associated with these you must use
+              the <literal>CHANGE MASTER TO ...</literal> statement (see
+              <xref linkend="change-master-to"/>).
             </para>
           </listitem>
 


Modified: trunk/refman-6.0/replication-configuration.xml
===================================================================
--- trunk/refman-6.0/replication-configuration.xml	2008-08-05 22:52:01 UTC (rev 11505)
+++ trunk/refman-6.0/replication-configuration.xml	2008-08-06 08:26:34 UTC (rev 11506)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 4; 1129 bytes

@@ -2134,10 +2134,13 @@
 
     <important>
       <para>
-        <emphasis>The following options were removed in MySQL
-        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
+        <emphasis>The following options were removed in MySQL 5.2.5. If
+        attempt to start <command>mysqld</command> with any of these
+        options in MySQL 6.0, the server aborts with an
+        <errortext>unknown variable</errortext> error.</emphasis> To
set
+        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: