List:Commits« Previous MessageNext Message »
From:jon.stephens Date:February 3 2011 11:26am
Subject:svn commit - mysqldoc@docsrva: r24972 - in trunk: dynamic-docs/command-optvars refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0
View as plain text  
Author: jstephens
Date: 2011-02-03 12:26:22 +0100 (Thu, 03 Feb 2011)
New Revision: 24972

Log:

Replication optvars fixes/maintenance:

  Added missing dynparas

  Added missing sysvar targets/optvar XML entries

  Reconciled some unneeded differences between versions



Modified:
   trunk/dynamic-docs/command-optvars/mysqld.xml
   trunk/refman-5.0/replication-options-core.xml
   trunk/refman-5.1/replication-options-core.xml
   trunk/refman-5.5/replication-options-core.xml
   trunk/refman-5.6/replication-options-core.xml
   trunk/refman-6.0/replication-options-core.xml


Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml	2011-02-03 08:02:15 UTC (rev 24971)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml	2011-02-03 11:26:22 UTC (rev 24972)
Changed blocks: 1, Lines Added: 67, Lines Deleted: 0; 2188 bytes

@@ -20811,6 +20811,73 @@
 
   </mysqloption>
 
+  <mysqloption section="replication" id="relay_log_info_file">
+
+    <xrefto id="sysvar_relay_log_info_file"/>
+
+    <name>relay_log_info_file</name>
+
+    <shortdescription>
+      The name of the file in which the slave records information about
+      the relay logs.
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--relay-log-info-file" setvar="relay_log_info_file"/>
+      <optype class="mycnf"/>
+      <vartype isdynamic="no" scope="global" class="system"/>
+    </types>
+
+    <values vartype="string" platform="all">
+      <value default="relay-log.info"/>
+    </values>
+
+    <versions>
+      <manual version="4.1"/>
+      <introduced version="4.1.1"/>
+      <manual version="5.0"/>
+      <manual version="5.1"/>
+      <manual version="5.4"/>
+      <manual version="5.5"/>
+      <manual version="5.6"/>
+      <manual version="6.0"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption section="replication" id="relay_log_index">
+
+    <xrefto id="sysvar_relay_log_index"/>
+
+    <name>relay_log_index</name>
+
+    <shortdescription>
+      The name of the relay log index file.
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--relay-log-info-file" setvar="relay_log_info_file"/>
+      <optype class="mycnf"/>
+      <vartype isdynamic="no" scope="global" class="system"/>
+    </types>
+
+    <values vartype="string" platform="all">
+      <value default="*host_name*-relay-bin.index"/>
+    </values>
+
+    <versions>
+      <manual version="4.1"/>
+      <introduced version="4.1.1"/>
+      <manual version="5.0"/>
+      <manual version="5.1"/>
+      <manual version="5.4"/>
+      <manual version="5.5"/>
+      <manual version="5.6"/>
+      <manual version="6.0"/>
+    </versions>
+
+  </mysqloption>
+
   <mysqloption section="replication" id="relay_log_recovery">
 
     <xrefto id="sysvar_relay_log_recovery"/>


Modified: trunk/refman-5.0/replication-options-core.xml
===================================================================
--- trunk/refman-5.0/replication-options-core.xml	2011-02-03 08:02:15 UTC (rev 24971)
+++ trunk/refman-5.0/replication-options-core.xml	2011-02-03 11:26:22 UTC (rev 24972)
Changed blocks: 37, Lines Added: 142, Lines Deleted: 31; 17177 bytes

@@ -72,7 +72,9 @@
       replication and the binary log.
     </para>
 
-    <para condition="dynamic:optvar:fullsummary" role="5.0:mysqld:section-replication:Replication Option/Variable Summary"/>
+    <para condition="dynamic:optvar:fullsummary" role="5.0:mysqld:section-replication">
+      <citetitle>Replication Option/Variable Summary</citetitle>
+    </para>
 
     <para>
       <xref linkend="replication-options-master"/>, provides more

@@ -82,7 +84,9 @@
       <xref linkend="replication-options-slave"/>.
     </para>
 
-    <para condition="dynamic:optvar:fullsummary" role="5.0:mysqld:section-binlog:Binary Logging Option/Variable Summary"/>
+    <para condition="dynamic:optvar:fullsummary" role="5.0:mysqld:section-binlog">
+      <citetitle>Binary Logging Option/Variable Summary</citetitle>
+    </para>
 
     <para>
       <xref linkend="replication-options-binary-log"/>, provides more

@@ -761,7 +765,7 @@
       </listitem>
 
       <listitem>
-        <para>
+        <para id="option_mysqld_log-warnings">
           <indexterm>
             <primary>mysqld</primary>
             <secondary>log-warnings option</secondary>

@@ -811,6 +815,8 @@
           <option role="mysqld">--master-connect-retry=<replaceable>seconds</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:master-connect-retry"/>
+
         <para>
           The number of seconds that the slave thread sleeps before
           trying to reconnect to the master in case the master goes down

@@ -840,6 +846,8 @@
           <option role="mysqld">--master-host=<replaceable>host_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:master-host"/>
+
         <para>
           The host name or IP address of the master replication server.
           The value in <filename>master.info</filename> takes precedence

@@ -889,6 +897,8 @@
           <option role="mysqld">--master-password=<replaceable>password</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:master-password"/>
+
         <para>
           The password of the account that the slave thread uses for
           authentication when it connects to the master. The value in

@@ -912,6 +922,8 @@
           <option role="mysqld">--master-port=<replaceable>port_number</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:master-port"/>
+
         <para>
           The TCP/IP port number that the master is listening on. The
           value in the <filename>master.info</filename> file takes

@@ -1054,18 +1066,43 @@
           <option role="mysqld">--master-user=<replaceable>user_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:master-user"/>
+
         <para>
           The user name of the account that the slave thread uses for
           authentication when it connects to the master. This account
           must have the <literal role="priv">REPLICATION SLAVE</literal>
-          privilege. <literal role="priv">FILE</literal> privilege
-          instead.) The value in the <filename>master.info</filename>
+          privilege. The value in the <filename>master.info</filename>
           file takes precedence if it can be read. If the master user
           name is not set, the name <literal>test</literal> is assumed.
         </para>
       </listitem>
 
       <listitem>
+        <para id="option_mysqld_max-relay-log-size">
+          <indexterm>
+            <primary>mysqld</primary>
+            <secondary>max-relay-log-size option</secondary>
+          </indexterm>
+
+          <indexterm>
+            <primary>max-relay-log-size option</primary>
+            <secondary>mysqld</secondary>
+          </indexterm>
+
+          <option role="mysqld">--max-relay-log-size=<replaceable>size</replaceable></option>
+        </para>
+
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:max-relay-log-size"/>
+
+        <para>
+          The size at which the server rotates relay log files
+          automatically. For more information, see
+          <xref linkend="slave-logs"/>. The default size is 1GB.
+        </para>
+      </listitem>
+
+      <listitem>
         <para id="option_mysqld_read-only">
           <indexterm>
             <primary>mysqld</primary>

@@ -1080,6 +1117,8 @@
           <option role="mysqld">--read-only</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:read-only"/>
+
         <para>
           Cause the slave to permit no updates except from slave threads
           or from users having the <literal role="priv">SUPER</literal>

@@ -1105,6 +1144,8 @@
           <option role="mysqld">--relay-log=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:relay-log"/>
+
         <para>
           The basename for the relay log. The default basename is
           <filename><replaceable>host_name</replaceable>-relay-bin</filename>.

@@ -1183,6 +1224,8 @@
           <option role="mysqld">--relay-log-index=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:relay-log-index"/>
+
         <para>
           The name to use for the relay log index file. The default name
           is

@@ -1229,6 +1272,8 @@
           <option role="mysqld">--relay-log-info-file=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:relay-log-info-file"/>
+
         <para>
           The name to use for the file in which the slave records
           information about the relay logs. The default name is

@@ -1253,6 +1298,8 @@
           <option role="mysqld">--relay-log-purge={0|1}</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:relay-log-purge"/>
+
         <para>
           Disable or enable automatic purging of relay logs as soon as
           they are no longer needed. The default value is 1 (enabled).

@@ -1263,30 +1310,6 @@
       </listitem>
 
       <listitem>
-        <para id="option_mysqld_max-relay-log-size">
-          <indexterm>
-            <primary>mysqld</primary>
-            <secondary>max-relay-log-size option</secondary>
-          </indexterm>
-
-          <indexterm>
-            <primary>max-relay-log-size option</primary>
-            <secondary>mysqld</secondary>
-          </indexterm>
-
-          <option role="mysqld">--max-relay-log-size=<replaceable>size</replaceable></option>
-        </para>
-
-        <para condition="dynamic:optvar:item" role="5.0:mysqld:max-relay-log-size"/>
-
-        <para>
-          The size at which the server rotates relay log files
-          automatically. For more information, see
-          <xref linkend="slave-logs"/>. Default is 1GB.
-        </para>
-      </listitem>
-
-      <listitem>
         <para id="option_mysqld_relay-log-space-limit">
           <indexterm>
             <primary>mysqld</primary>

@@ -1301,6 +1324,8 @@
           <option role="mysqld">--relay-log-space-limit=<replaceable>size</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:relay-log-space-limit"/>
+
         <para>
           This option places an upper limit on the total size in bytes
           of all relay logs on the slave. A value of 0 means <quote>no

@@ -1345,6 +1370,8 @@
           <option role="mysqld">--replicate-do-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:replicate-do-db"/>
+
         <para>
           Tell the slave SQL thread to restrict replication to
           statements where the default database (that is, the one

@@ -1424,6 +1451,8 @@
           <option role="mysqld">--replicate-ignore-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:replicate-ignore-db"/>
+
         <para>
           Tells the slave SQL thread not to replicate any statement
           where the default database (that is, the one selected by

@@ -1490,6 +1519,8 @@
           <option role="mysqld">--replicate-do-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:replicate-do-table"/>
+
         <para>
           Tells the slave SQL thread to restrict replication to the
           specified table. To specify more than one table, use this

@@ -1523,6 +1554,8 @@
           <option role="mysqld">--replicate-ignore-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:replicate-ignore-table"/>
+
         <para>
           Tells the slave SQL thread not to replicate any statement that
           updates the specified table, even if any other tables might be

@@ -1557,6 +1590,8 @@
           <option role="mysqld">--replicate-rewrite-db=<replaceable>from_name</replaceable>-&gt;<replaceable>to_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:replicate-rewrite-db"/>
+
         <para>
           Tells the slave to translate the default database (that is,
           the one selected by <literal role="stmt">USE</literal>) to

@@ -1601,6 +1636,8 @@
           <option role="mysqld">--replicate-same-server-id</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:replicate-same-server-id"/>
+
         <para>
           To be used on slave servers. Usually you should use the
           default setting of 0, to prevent infinite loops caused by

@@ -1633,6 +1670,8 @@
           <option role="mysqld">--replicate-wild-do-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:replicate-wild-do-table"/>
+
         <para>
           Tells the slave thread to restrict replication to statements
           where any of the updated tables match the specified database

@@ -1705,6 +1744,8 @@
           <option role="mysqld">--replicate-wild-ignore-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:replicate-wild-ignore-table"/>
+
         <para>
           Tells the slave thread not to replicate a statement where any
           table matches the given wildcard pattern. To specify more than

@@ -1747,6 +1788,8 @@
           <option role="mysqld">--report-host=<replaceable>host_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:report-host"/>
+
         <para>
           The host name or IP address of the slave to be reported to the
           master during slave registration. This value appears in the

@@ -1775,6 +1818,8 @@
           <option role="mysqld">--report-password=<replaceable>password</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:report-password"/>
+
         <para>
           The account password of the slave to be reported to the master
           during slave registration. This value appears in the output of

@@ -1800,6 +1845,8 @@
           <option role="mysqld">--report-port=<replaceable>slave_port_num</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:report-port"/>
+
         <para>
           The TCP/IP port number for connecting to the slave, to be
           reported to the master during slave registration. Set this

@@ -1824,6 +1871,8 @@
           <option role="mysqld">--report-user=<replaceable>user_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:report-user"/>
+
         <para>
           The account user name of the slave to be reported to the
           master during slave registration. This value appears in the

@@ -1849,6 +1898,8 @@
           <option role="mysqld">--show-slave-auth-info</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:show-slave-auth-info"/>
+
         <para>
           Display slave user names and passwords in the output of
           <literal role="stmt">SHOW SLAVE HOSTS</literal> on the master

@@ -1873,6 +1924,8 @@
           <option role="mysqld">--skip-slave-start</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:skip-slave-start"/>
+
         <para>
           Tells the slave server not to start the slave threads when the
           server starts. To start the threads later, use a

@@ -1895,6 +1948,8 @@
           <option role="sysvar">--slave_compressed_protocol={0|1}</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:slave_compressed_protocol"/>
+
         <para>
           If this option is set to 1, use compression for the
           slave/master protocol if both the slave and the master support

@@ -1917,6 +1972,8 @@
           <option role="mysqld">--slave-load-tmpdir=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:slave-load-tempdir"/>
+
         <para>
           The name of the directory where the slave creates temporary
           files. This option is by default equal to the value of the

@@ -1961,6 +2018,8 @@
           <option role="mysqld">--slave-net-timeout=<replaceable>seconds</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:slave-net-timeout"/>
+
         <para>
           The number of seconds to wait for more data from the master
           before the slave considers the connection broken, aborts the

@@ -1990,6 +2049,8 @@
           <option role="mysqld">--slave-skip-errors=[<replaceable>err_code1</replaceable>,<replaceable>err_code2</replaceable>,...|all]</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:slave-skip-errors"/>
+
         <para>
           Normally, replication stops when an error occurs on the slave.
           This gives you the opportunity to resolve the inconsistency in

@@ -2093,6 +2154,54 @@
       </listitem>
 
       <listitem>
+        <para id="sysvar_relay_log_index">
+          <indexterm>
+            <primary>relay_log_index system variable</primary>
+          </indexterm>
+
+          <indexterm>
+            <primary>system variable</primary>
+            <secondary>relay_log_index</secondary>
+          </indexterm>
+
+          <literal role="sysvar">relay_log_index</literal>
+        </para>
+
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:relay_log_index"/>
+
+        <para>
+          The name of the relay log index file. The default name is
+          <filename><replaceable>host_name</replaceable>-relay-bin.index</filename>
+          in the data directory, where
+          <replaceable>host_name</replaceable> is the name of the slave
+          server.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para id="sysvar_relay_log_info_file">
+          <indexterm>
+            <primary>relay_log_info_file system variable</primary>
+          </indexterm>
+
+          <indexterm>
+            <primary>system variable</primary>
+            <secondary>relay_log_info_file</secondary>
+          </indexterm>
+
+          <literal role="sysvar">relay_log_info_file</literal>
+        </para>
+
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:relay_log_info_file"/>
+
+        <para>
+          The name of the file in which the slave records information
+          about the relay logs. The default name is
+          <filename>relay-log.info</filename> in the data directory.
+        </para>
+      </listitem>
+
+      <listitem>
         <para id="sysvar_rpl_recovery_rank">
           <literal role="sysvar">rpl_recovery_rank</literal>
         </para>

@@ -2466,6 +2575,8 @@
           <option role="mysqld">--binlog-do-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:binlog-do-db"/>
+
         <para>
           This option affects binary logging in a manner similar to the
           way that <option role="mysqld">--replicate-do-db</option>

@@ -2500,12 +2611,10 @@
           <emphasis>not</emphasis> logged:
         </para>
 
-        <para>
 <programlisting>
 USE prices;
 UPDATE sales.january SET amount=amount+1000;
 </programlisting>
-        </para>
 
         <para>
           The main reason for this <quote>just check the default

@@ -2566,6 +2675,8 @@
           <option role="mysqld">--binlog-ignore-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.0:mysqld:binlog-ignore-db"/>
+
         <para>
           This option affects binary logging in a manner similar to the
           way that <option role="mysqld">--replicate-ignore-db</option>


Modified: trunk/refman-5.1/replication-options-core.xml
===================================================================
--- trunk/refman-5.1/replication-options-core.xml	2011-02-03 08:02:15 UTC (rev 24971)
+++ trunk/refman-5.1/replication-options-core.xml	2011-02-03 11:26:22 UTC (rev 24972)
Changed blocks: 36, Lines Added: 117, Lines Deleted: 4; 15322 bytes

@@ -885,7 +885,7 @@
       </listitem>
 
       <listitem>
-        <para>
+        <para id="option_mysqld_log-warnings">
           <indexterm>
             <primary>mysqld</primary>
             <secondary>log-warnings option</secondary>

@@ -935,6 +935,8 @@
           <option role="mysqld">--master-connect-retry=<replaceable>seconds</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:master-connect-retry"/>
+
         <para>
           The number of seconds that the slave thread sleeps before
           trying to reconnect to the master in case the master goes down

@@ -969,6 +971,8 @@
           <option role="mysqld">--master-host=<replaceable>host_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:master-host"/>
+
         <para>
           The host name or IP address of the master replication server.
           The value in <filename>master.info</filename> takes precedence

@@ -1023,6 +1027,8 @@
           <option role="mysqld">--master-password=<replaceable>password</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:master-password"/>
+
         <para>
           The password of the account that the slave thread uses for
           authentication when it connects to the master. The value in

@@ -1051,6 +1057,8 @@
           <option role="mysqld">--master-port=<replaceable>port_number</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:master-port"/>
+
         <para>
           The TCP/IP port number that the master is listening on. The
           value in the <filename>master.info</filename> file takes

@@ -1203,6 +1211,8 @@
           <option role="mysqld">--master-user=<replaceable>user_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:master-user"/>
+
         <para>
           The user name of the account that the slave thread uses for
           authentication when it connects to the master. This account

@@ -1257,6 +1267,8 @@
           <option role="mysqld">--read-only</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:read-only"/>
+
         <para>
           Cause the slave to permit no updates except from slave threads
           or from users having the <literal role="priv">SUPER</literal>

@@ -1282,6 +1294,8 @@
           <option role="mysqld">--relay-log=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:relay-log"/>
+
         <para>
           The basename for the relay log. The default basename is
           <filename><replaceable>host_name</replaceable>-relay-bin</filename>.

@@ -1360,6 +1374,8 @@
           <option role="mysqld">--relay-log-index=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:relay-log-index"/>
+
         <para>
           The name to use for the relay log index file. The default name
           is

@@ -1406,6 +1422,8 @@
           <option role="mysqld">--relay-log-info-file=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:relay-log-info-file"/>
+
         <para>
           The name to use for the file in which the slave records
           information about the relay logs. The default name is

@@ -1430,6 +1448,8 @@
           <option role="mysqld">--relay-log-purge={0|1}</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:relay-log-purge"/>
+
         <para>
           Disable or enable automatic purging of relay logs as soon as
           they are no longer needed. The default value is 1 (enabled).

@@ -1454,6 +1474,8 @@
           <option role="mysqld">--relay-log-space-limit=<replaceable>size</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:relay-log-space-limit"/>
+
         <para>
           This option places an upper limit on the total size in bytes
           of all relay logs on the slave. A value of 0 means <quote>no

@@ -1498,6 +1520,8 @@
           <option role="mysqld">--replicate-do-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:replicate-do-db"/>
+
         <para>
           The effects of this option depend on whether statement-based
           or row-based replication is in use.

@@ -1683,6 +1707,8 @@
           <option role="mysqld">--replicate-ignore-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:replicate-ignore-db"/>
+
         <para>
           As with <option role="mysqld">--replicate-do-db</option>, the
           effects of this option depend on whether statement-based or

@@ -1720,12 +1746,14 @@
           started with
           <option role="mysqld">--replicate-ignore-db=sales</option> and
           you issue the following statements on the master:
+        </para>
 
 <programlisting>
 USE prices;
 UPDATE sales.january SET amount=amount+1000;
 </programlisting>
 
+        <para>
           The <literal role="stmt">UPDATE</literal> statement
           <emphasis>is</emphasis> replicated in such a case because
           <option role="mysqld">--replicate-ignore-db</option> applies

@@ -1799,6 +1827,8 @@
           <option role="mysqld">--replicate-do-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:replicate-do-table"/>
+
         <para>
           Tells the slave SQL thread to restrict replication to the
           specified table. To specify more than one table, use this

@@ -1832,6 +1862,8 @@
           <option role="mysqld">--replicate-ignore-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:replicate-ignore-table"/>
+
         <para>
           Tells the slave SQL thread not to replicate any statement that
           updates the specified table, even if any other tables might be

@@ -1866,6 +1898,8 @@
           <option role="mysqld">--replicate-rewrite-db=<replaceable>from_name</replaceable>-&gt;<replaceable>to_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:replicate-rewrite-db"/>
+
         <para>
           Tells the slave to translate the default database (that is,
           the one selected by <literal role="stmt">USE</literal>) to

@@ -1910,6 +1944,8 @@
           <option role="mysqld">--replicate-same-server-id</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:replicate-same-server-id"/>
+
         <para>
           To be used on slave servers. Usually you should use the
           default setting of 0, to prevent infinite loops caused by

@@ -1942,6 +1978,8 @@
           <option role="mysqld">--replicate-wild-do-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:replicate-wild-do-table"/>
+
         <para>
           Tells the slave thread to restrict replication to statements
           where any of the updated tables match the specified database

@@ -2014,6 +2052,8 @@
           <option role="mysqld">--replicate-wild-ignore-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:replicate-wild-ignore-table"/>
+
         <para>
           Tells the slave thread not to replicate a statement where any
           table matches the given wildcard pattern. To specify more than

@@ -2056,6 +2096,8 @@
           <option role="mysqld">--report-host=<replaceable>host_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:report-host"/>
+
         <para>
           The host name or IP address of the slave to be reported to the
           master during slave registration. This value appears in the

@@ -2084,6 +2126,8 @@
           <option role="mysqld">--report-password=<replaceable>password</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:report-password"/>
+
         <para>
           The account password of the slave to be reported to the master
           during slave registration. This value appears in the output of

@@ -2109,6 +2153,8 @@
           <option role="mysqld">--report-port=<replaceable>slave_port_num</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:report-port"/>
+
         <para>
           The TCP/IP port number for connecting to the slave, to be
           reported to the master during slave registration. Set this

@@ -2133,6 +2179,8 @@
           <option role="mysqld">--report-user=<replaceable>user_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:report-user"/>
+
         <para>
           The account user name of the slave to be reported to the
           master during slave registration. This value appears in the

@@ -2158,6 +2206,8 @@
           <option role="mysqld">--show-slave-auth-info</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:show-slave-auth-info"/>
+
         <para>
           Display slave user names and passwords in the output of
           <literal role="stmt">SHOW SLAVE HOSTS</literal> on the master

@@ -2182,6 +2232,8 @@
           <option role="mysqld">--skip-slave-start</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:skip-slave-start"/>
+
         <para>
           Tells the slave server not to start the slave threads when the
           server starts. To start the threads later, use a

@@ -2204,6 +2256,8 @@
           <option role="sysvar">--slave_compressed_protocol={0|1}</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:slave_compressed_protocol"/>
+
         <para>
           If this option is set to 1, use compression for the
           slave/master protocol if both the slave and the master support

@@ -2226,6 +2280,8 @@
           <option role="mysqld">--slave-load-tmpdir=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:slave-load-tempdir"/>
+
         <para>
           The name of the directory where the slave creates temporary
           files. This option is by default equal to the value of the

@@ -2270,6 +2326,8 @@
           <option role="mysqld">--slave-net-timeout=<replaceable>seconds</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:slave-net-timeout"/>
+
         <para>
           The number of seconds to wait for more data from the master
           before the slave considers the connection broken, aborts the

@@ -2300,6 +2358,8 @@
           <option role="mysqld">--slave-skip-errors=[<replaceable>err_code1</replaceable>,<replaceable>err_code2</replaceable>,...|all]</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:slave-skip-errors"/>
+
         <para>
           Normally, replication stops when an error occurs on the slave.
           This gives you the opportunity to resolve the inconsistency in

@@ -2410,6 +2470,54 @@
       </listitem>
 
       <listitem>
+        <para id="sysvar_relay_log_index">
+          <indexterm>
+            <primary>relay_log_index system variable</primary>
+          </indexterm>
+
+          <indexterm>
+            <primary>system variable</primary>
+            <secondary>relay_log_index</secondary>
+          </indexterm>
+
+          <literal role="sysvar">relay_log_index</literal>
+        </para>
+
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:relay_log_index"/>
+
+        <para>
+          The name of the relay log index file. The default name is
+          <filename><replaceable>host_name</replaceable>-relay-bin.index</filename>
+          in the data directory, where
+          <replaceable>host_name</replaceable> is the name of the slave
+          server.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para id="sysvar_relay_log_info_file">
+          <indexterm>
+            <primary>relay_log_info_file system variable</primary>
+          </indexterm>
+
+          <indexterm>
+            <primary>system variable</primary>
+            <secondary>relay_log_info_file</secondary>
+          </indexterm>
+
+          <literal role="sysvar">relay_log_info_file</literal>
+        </para>
+
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:relay_log_info_file"/>
+
+        <para>
+          The name of the file in which the slave records information
+          about the relay logs. The default name is
+          <filename>relay-log.info</filename> in the data directory.
+        </para>
+      </listitem>
+
+      <listitem>
         <para id="sysvar_rpl_recovery_rank">
           <literal role="sysvar">rpl_recovery_rank</literal>
         </para>

@@ -2854,6 +2962,8 @@
           <option role="mysqld">--binlog-do-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:binlog-do-db"/>
+
         <para>
           This option affects binary logging in a manner similar to the
           way that <option role="mysqld">--replicate-do-db</option>

@@ -3051,6 +3161,8 @@
           <option role="mysqld">--binlog-ignore-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.1:mysqld:binlog-ignore-db"/>
+
         <para>
           This option affects binary logging in a manner similar to the
           way that <option role="mysqld">--replicate-ignore-db</option>

@@ -3106,12 +3218,14 @@
           started with
           <option role="mysqld">--binlog-ignore-db=sales</option> and
           you issue the following statements:
+        </para>
 
 <programlisting>
 USE prices;
 UPDATE sales.january SET amount=amount+1000;
 </programlisting>
 
+        <para>
           The <literal role="stmt">UPDATE</literal> statement
           <emphasis>is</emphasis> logged in such a case because
           <option role="mysqld">--binlog-ignore-db</option> applies only

@@ -3124,9 +3238,8 @@
           are <emphasis>not</emphasis> written to the binary log, which
           means that no changes to the <literal>sales.january</literal>
           table are logged; in this instance,
-          <option
-                role="mysqld">--binlog-ignore-db=sales</option>
-          causes <emphasis>all</emphasis> changes made to tables in the
+          <option role="mysqld">--binlog-ignore-db=sales</option> causes
+          <emphasis>all</emphasis> changes made to tables in the
           master&apos;s copy of the <literal>sales</literal> database to
           be ignored for purposes of binary logging.
         </para>


Modified: trunk/refman-5.5/replication-options-core.xml
===================================================================
--- trunk/refman-5.5/replication-options-core.xml	2011-02-03 08:02:15 UTC (rev 24971)
+++ trunk/refman-5.5/replication-options-core.xml	2011-02-03 11:26:22 UTC (rev 24972)
Changed blocks: 30, Lines Added: 105, Lines Deleted: 1; 12597 bytes

@@ -617,7 +617,7 @@
       </listitem>
 
       <listitem>
-        <para>
+        <para id="option_mysqld_log-warnings">
           <indexterm>
             <primary>mysqld</primary>
             <secondary>log-warnings option</secondary>

@@ -750,6 +750,8 @@
           <option role="mysqld">--read-only</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:read-only"/>
+
         <para>
           Cause the slave to permit no updates except from slave threads
           or from users having the <literal role="priv">SUPER</literal>

@@ -775,6 +777,8 @@
           <option role="mysqld">--relay-log=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:relay-log"/>
+
         <para>
           The basename for the relay log. The default basename is
           <filename><replaceable>host_name</replaceable>-relay-bin</filename>.

@@ -853,6 +857,8 @@
           <option role="mysqld">--relay-log-index=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:relay-log-index"/>
+
         <para>
           The name to use for the relay log index file. The default name
           is

@@ -899,6 +905,8 @@
           <option role="mysqld">--relay-log-info-file=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:relay-log-info-file"/>
+
         <para>
           The name to use for the file in which the slave records
           information about the relay logs. The default name is

@@ -923,6 +931,8 @@
           <option role="mysqld">--relay-log-purge={0|1}</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:relay-log-purge"/>
+
         <para>
           Disable or enable automatic purging of relay logs as soon as
           they are no longer needed. The default value is 1 (enabled).

@@ -947,6 +957,8 @@
           <option role="mysqld">--relay-log-recovery={0|1}</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:relay-log-recovery"/>
+
         <para>
           Enables automatic relay log recovery immediately following
           server startup, which means that the replication slave

@@ -972,6 +984,8 @@
           <option role="mysqld">--relay-log-space-limit=<replaceable>size</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:relay-log-space-limit"/>
+
         <para>
           This option places an upper limit on the total size in bytes
           of all relay logs on the slave. A value of 0 means <quote>no

@@ -1016,6 +1030,8 @@
           <option role="mysqld">--replicate-do-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:replicate-do-db"/>
+
         <para>
           The effects of this option depend on whether statement-based
           or row-based replication is in use.

@@ -1057,12 +1073,14 @@
           and you issue the following statements on the master, the
           <literal role="stmt">UPDATE</literal> statement is
           <emphasis>not</emphasis> replicated:
+        </para>
 
 <programlisting>
 USE prices;
 UPDATE sales.january SET amount=amount+1000;
 </programlisting>
 
+        <para>
           The main reason for this <quote>check just the default
           database</quote> behavior is that it is difficult from the
           statement alone to know whether it should be replicated (for

@@ -1199,6 +1217,8 @@
           <option role="mysqld">--replicate-ignore-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:replicate-ignore-db"/>
+
         <para>
           As with <option role="mysqld">--replicate-do-db</option>, the
           effects of this option depend on whether statement-based or

@@ -1315,6 +1335,8 @@
           <option role="mysqld">--replicate-do-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:replicate-do-table"/>
+
         <para>
           Tells the slave SQL thread to restrict replication to the
           specified table. To specify more than one table, use this

@@ -1348,6 +1370,8 @@
           <option role="mysqld">--replicate-ignore-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:replicate-ignore-table"/>
+
         <para>
           Tells the slave SQL thread not to replicate any statement that
           updates the specified table, even if any other tables might be

@@ -1382,6 +1406,8 @@
           <option role="mysqld">--replicate-rewrite-db=<replaceable>from_name</replaceable>-&gt;<replaceable>to_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:replicate-rewrite-db"/>
+
         <para>
           Tells the slave to translate the default database (that is,
           the one selected by <literal role="stmt">USE</literal>) to

@@ -1426,6 +1452,8 @@
           <option role="mysqld">--replicate-same-server-id</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:replicate-same-server-id"/>
+
         <para>
           To be used on slave servers. Usually you should use the
           default setting of 0, to prevent infinite loops caused by

@@ -1458,6 +1486,8 @@
           <option role="mysqld">--replicate-wild-do-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:replicate-wild-do-table"/>
+
         <para>
           Tells the slave thread to restrict replication to statements
           where any of the updated tables match the specified database

@@ -1530,6 +1560,8 @@
           <option role="mysqld">--replicate-wild-ignore-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:replicate-wild-ignore-table"/>
+
         <para>
           Tells the slave thread not to replicate a statement where any
           table matches the given wildcard pattern. To specify more than

@@ -1572,6 +1604,8 @@
           <option role="mysqld">--report-host=<replaceable>host_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:report-host"/>
+
         <para>
           The host name or IP address of the slave to be reported to the
           master during slave registration. This value appears in the

@@ -1600,6 +1634,8 @@
           <option role="mysqld">--report-password=<replaceable>password</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:report-password"/>
+
         <para>
           The account password of the slave to be reported to the master
           during slave registration. This value appears in the output of

@@ -1625,6 +1661,8 @@
           <option role="mysqld">--report-port=<replaceable>slave_port_num</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:report-port"/>
+
         <para>
           The TCP/IP port number for connecting to the slave, to be
           reported to the master during slave registration. Set this

@@ -1649,6 +1687,8 @@
           <option role="mysqld">--report-user=<replaceable>user_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:report-user"/>
+
         <para>
           The account user name of the slave to be reported to the
           master during slave registration. This value appears in the

@@ -1674,6 +1714,8 @@
           <option role="mysqld">--show-slave-auth-info</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:show-slave-auth-info"/>
+
         <para>
           Display slave user names and passwords in the output of
           <literal role="stmt">SHOW SLAVE HOSTS</literal> on the master

@@ -1698,6 +1740,8 @@
           <option role="mysqld">--skip-slave-start</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:skip-slave-start"/>
+
         <para>
           Tells the slave server not to start the slave threads when the
           server starts. To start the threads later, use a

@@ -1720,6 +1764,8 @@
           <option role="sysvar">--slave_compressed_protocol={0|1}</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:slave_compressed_protocol"/>
+
         <para>
           If this option is set to 1, use compression for the
           slave/master protocol if both the slave and the master support

@@ -1742,6 +1788,8 @@
           <option role="mysqld">--slave-load-tmpdir=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:slave-load-tmpdir"/>
+
         <para>
           The name of the directory where the slave creates temporary
           files. This option is by default equal to the value of the

@@ -1786,6 +1834,8 @@
           <option role="mysqld">--slave-net-timeout=<replaceable>seconds</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:slave-net-timeout"/>
+
         <para>
           The number of seconds to wait for more data from the master
           before the slave considers the connection broken, aborts the

@@ -2008,6 +2058,54 @@
       </listitem>
 
       <listitem>
+        <para id="sysvar_relay_log_index">
+          <indexterm>
+            <primary>relay_log_index system variable</primary>
+          </indexterm>
+
+          <indexterm>
+            <primary>system variable</primary>
+            <secondary>relay_log_index</secondary>
+          </indexterm>
+
+          <literal role="sysvar">relay_log_index</literal>
+        </para>
+
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:relay_log_index"/>
+
+        <para>
+          The name of the relay log index file. The default name is
+          <filename><replaceable>host_name</replaceable>-relay-bin.index</filename>
+          in the data directory, where
+          <replaceable>host_name</replaceable> is the name of the slave
+          server.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para id="sysvar_relay_log_info_file">
+          <indexterm>
+            <primary>relay_log_info_file system variable</primary>
+          </indexterm>
+
+          <indexterm>
+            <primary>system variable</primary>
+            <secondary>relay_log_info_file</secondary>
+          </indexterm>
+
+          <literal role="sysvar">relay_log_info_file</literal>
+        </para>
+
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:relay_log_info_file"/>
+
+        <para>
+          The name of the file in which the slave records information
+          about the relay logs. The default name is
+          <filename>relay-log.info</filename> in the data directory.
+        </para>
+      </listitem>
+
+      <listitem>
         <para id="sysvar_relay_log_recovery">
           <indexterm>
             <primary>system variable</primary>

@@ -2021,6 +2119,8 @@
           <literal role="sysvar">relay_log_recovery</literal>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:relay_log_recovery"/>
+
         <para>
           Enables automatic relay log recovery immediately following
           server startup, which means that the replication slave

@@ -2554,6 +2654,8 @@
           <option role="mysqld">--binlog-do-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:binlog-do-db"/>
+
         <para>
           This option affects binary logging in a manner similar to the
           way that <option role="mysqld">--replicate-do-db</option>

@@ -2751,6 +2853,8 @@
           <option role="mysqld">--binlog-ignore-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:binlog-ignore-db"/>
+
         <para>
           This option affects binary logging in a manner similar to the
           way that <option role="mysqld">--replicate-ignore-db</option>


Modified: trunk/refman-5.6/replication-options-core.xml
===================================================================
--- trunk/refman-5.6/replication-options-core.xml	2011-02-03 08:02:15 UTC (rev 24971)
+++ trunk/refman-5.6/replication-options-core.xml	2011-02-03 11:26:22 UTC (rev 24972)
Changed blocks: 30, Lines Added: 105, Lines Deleted: 1; 12564 bytes

@@ -778,7 +778,7 @@
       </listitem>
 
       <listitem>
-        <para>
+        <para id="option_mysqld_log-warnings">
           <indexterm>
             <primary>mysqld</primary>
             <secondary>log-warnings option</secondary>

@@ -911,6 +911,8 @@
           <option role="mysqld">--read-only</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:read-only"/>
+
         <para>
           Cause the slave to permit no updates except from slave threads
           or from users having the <literal role="priv">SUPER</literal>

@@ -936,6 +938,8 @@
           <option role="mysqld">--relay-log=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:relay-log"/>
+
         <para>
           The basename for the relay log. The default basename is
           <filename><replaceable>host_name</replaceable>-relay-bin</filename>.

@@ -1014,6 +1018,8 @@
           <option role="mysqld">--relay-log-index=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:relay-log-index"/>
+
         <para>
           The name to use for the relay log index file. The default name
           is

@@ -1060,6 +1066,8 @@
           <option role="mysqld">--relay-log-info-file=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:relay-log-info-file"/>
+
         <para>
           The name to use for the file in which the slave records
           information about the relay logs. The default name is

@@ -1084,6 +1092,8 @@
           <option role="mysqld">--relay-log-purge={0|1}</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:relay-log-purge"/>
+
         <para>
           Disable or enable automatic purging of relay logs as soon as
           they are no longer needed. The default value is 1 (enabled).

@@ -1108,6 +1118,8 @@
           <option role="mysqld">--relay-log-recovery={0|1}</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:relay-log-recovery"/>
+
         <para>
           Enables automatic relay log recovery immediately following
           server startup, which means that the replication slave

@@ -1133,6 +1145,8 @@
           <option role="mysqld">--relay-log-space-limit=<replaceable>size</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:relay-log-space-limit"/>
+
         <para>
           This option places an upper limit on the total size in bytes
           of all relay logs on the slave. A value of 0 means <quote>no

@@ -1177,6 +1191,8 @@
           <option role="mysqld">--replicate-do-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:replicate-do-db"/>
+
         <para>
           The effects of this option depend on whether statement-based
           or row-based replication is in use.

@@ -1362,6 +1378,8 @@
           <option role="mysqld">--replicate-ignore-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:replicate-ignore-db"/>
+
         <para>
           As with <option role="mysqld">--replicate-do-db</option>, the
           effects of this option depend on whether statement-based or

@@ -1478,6 +1496,8 @@
           <option role="mysqld">--replicate-do-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:replicate-do-table"/>
+
         <para>
           Tells the slave SQL thread to restrict replication to the
           specified table. To specify more than one table, use this

@@ -1511,6 +1531,8 @@
           <option role="mysqld">--replicate-ignore-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:replicate-ignore-table"/>
+
         <para>
           Tells the slave SQL thread not to replicate any statement that
           updates the specified table, even if any other tables might be

@@ -1545,6 +1567,8 @@
           <option role="mysqld">--replicate-rewrite-db=<replaceable>from_name</replaceable>-&gt;<replaceable>to_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:replicate-rewrite-db"/>
+
         <para>
           Tells the slave to translate the default database (that is,
           the one selected by <literal role="stmt">USE</literal>) to

@@ -1589,6 +1613,8 @@
           <option role="mysqld">--replicate-same-server-id</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:replicate-same-server-id"/>
+
         <para>
           To be used on slave servers. Usually you should use the
           default setting of 0, to prevent infinite loops caused by

@@ -1621,6 +1647,8 @@
           <option role="mysqld">--replicate-wild-do-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:replicate-wild-do-table"/>
+
         <para>
           Tells the slave thread to restrict replication to statements
           where any of the updated tables match the specified database

@@ -1693,6 +1721,8 @@
           <option role="mysqld">--replicate-wild-ignore-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:replicate-wild-ignore-table"/>
+
         <para>
           Tells the slave thread not to replicate a statement where any
           table matches the given wildcard pattern. To specify more than

@@ -1735,6 +1765,8 @@
           <option role="mysqld">--report-host=<replaceable>host_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:report-host"/>
+
         <para>
           The host name or IP address of the slave to be reported to the
           master during slave registration. This value appears in the

@@ -1763,6 +1795,8 @@
           <option role="mysqld">--report-password=<replaceable>password</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:report-password"/>
+
         <para>
           The account password of the slave to be reported to the master
           during slave registration. This value appears in the output of

@@ -1788,6 +1822,8 @@
           <option role="mysqld">--report-port=<replaceable>slave_port_num</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:report-port"/>
+
         <para>
           The TCP/IP port number for connecting to the slave, to be
           reported to the master during slave registration. Set this

@@ -1812,6 +1848,8 @@
           <option role="mysqld">--report-user=<replaceable>user_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:report-user"/>
+
         <para>
           The account user name of the slave to be reported to the
           master during slave registration. This value appears in the

@@ -1837,6 +1875,8 @@
           <option role="mysqld">--show-slave-auth-info</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:show-slave-auth-info"/>
+
         <para>
           Display slave user names and passwords in the output of
           <literal role="stmt">SHOW SLAVE HOSTS</literal> on the master

@@ -1861,6 +1901,8 @@
           <option role="mysqld">--skip-slave-start</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:skip-slave-start"/>
+
         <para>
           Tells the slave server not to start the slave threads when the
           server starts. To start the threads later, use a

@@ -1883,6 +1925,8 @@
           <option role="sysvar">--slave_compressed_protocol={0|1}</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:slave_compressed_protocol"/>
+
         <para>
           If this option is set to 1, use compression for the
           slave/master protocol if both the slave and the master support

@@ -1905,6 +1949,8 @@
           <option role="mysqld">--slave-load-tmpdir=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:slave-load-tmpdir"/>
+
         <para>
           The name of the directory where the slave creates temporary
           files. This option is by default equal to the value of the

@@ -1949,6 +1995,8 @@
           <option role="mysqld">--slave-net-timeout=<replaceable>seconds</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:slave-net-timeout"/>
+
         <para>
           The number of seconds to wait for more data from the master
           before the slave considers the connection broken, aborts the

@@ -2171,6 +2219,54 @@
       </listitem>
 
       <listitem>
+        <para id="sysvar_relay_log_index">
+          <indexterm>
+            <primary>relay_log_index system variable</primary>
+          </indexterm>
+
+          <indexterm>
+            <primary>system variable</primary>
+            <secondary>relay_log_index</secondary>
+          </indexterm>
+
+          <literal role="sysvar">relay_log_index</literal>
+        </para>
+
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:relay_log_index"/>
+
+        <para>
+          The name of the relay log index file. The default name is
+          <filename><replaceable>host_name</replaceable>-relay-bin.index</filename>
+          in the data directory, where
+          <replaceable>host_name</replaceable> is the name of the slave
+          server.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para id="sysvar_relay_log_info_file">
+          <indexterm>
+            <primary>relay_log_info_file system variable</primary>
+          </indexterm>
+
+          <indexterm>
+            <primary>system variable</primary>
+            <secondary>relay_log_info_file</secondary>
+          </indexterm>
+
+          <literal role="sysvar">relay_log_info_file</literal>
+        </para>
+
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:relay_log_info_file"/>
+
+        <para>
+          The name of the file in which the slave records information
+          about the relay logs. The default name is
+          <filename>relay-log.info</filename> in the data directory.
+        </para>
+      </listitem>
+
+      <listitem>
         <para id="sysvar_relay_log_recovery">
           <indexterm>
             <primary>system variable</primary>

@@ -2184,6 +2280,8 @@
           <literal role="sysvar">relay_log_recovery</literal>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:relay_log_recovery"/>
+
         <para>
           Enables automatic relay log recovery immediately following
           server startup, which means that the replication slave

@@ -2703,6 +2801,8 @@
           <option role="mysqld">--binlog-do-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:binlog-do-db"/>
+
         <para>
           This option affects binary logging in a manner similar to the
           way that <option role="mysqld">--replicate-do-db</option>

@@ -2900,6 +3000,8 @@
           <option role="mysqld">--binlog-ignore-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="5.6:mysqld:binlog-ignore-db"/>
+
         <para>
           This option affects binary logging in a manner similar to the
           way that <option role="mysqld">--replicate-ignore-db</option>

@@ -2955,12 +3057,14 @@
           started with
           <option role="mysqld">--binlog-ignore-db=sales</option> and
           you issue the following statements:
+        </para>
 
 <programlisting>
 USE prices;
 UPDATE sales.january SET amount=amount+1000;
 </programlisting>
 
+        <para>
           The <literal role="stmt">UPDATE</literal> statement
           <emphasis>is</emphasis> logged in such a case because
           <option role="mysqld">--binlog-ignore-db</option> applies only


Modified: trunk/refman-6.0/replication-options-core.xml
===================================================================
--- trunk/refman-6.0/replication-options-core.xml	2011-02-03 08:02:15 UTC (rev 24971)
+++ trunk/refman-6.0/replication-options-core.xml	2011-02-03 11:26:22 UTC (rev 24972)
Changed blocks: 38, Lines Added: 140, Lines Deleted: 22; 17644 bytes

@@ -615,7 +615,7 @@
       </listitem>
 
       <listitem>
-        <para>
+        <para id="option_mysqld_log-warnings">
           <indexterm>
             <primary>mysqld</primary>
             <secondary>log-warnings option</secondary>

@@ -748,6 +748,8 @@
           <option role="mysqld">--read-only</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:read-only"/>
+
         <para>
           Cause the slave to permit no updates except from slave threads
           or from users having the <literal role="priv">SUPER</literal>

@@ -773,6 +775,8 @@
           <option role="mysqld">--relay-log=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:relay-log"/>
+
         <para>
           The basename for the relay log. The default basename is
           <filename><replaceable>host_name</replaceable>-relay-bin</filename>.

@@ -851,6 +855,8 @@
           <option role="mysqld">--relay-log-index=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:relay-log-index"/>
+
         <para>
           The name to use for the relay log index file. The default name
           is

@@ -897,6 +903,8 @@
           <option role="mysqld">--relay-log-info-file=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:relay-log-info-file"/>
+
         <para>
           The name to use for the file in which the slave records
           information about the relay logs. The default name is

@@ -921,6 +929,8 @@
           <option role="mysqld">--relay-log-purge={0|1}</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:relay-log-purge"/>
+
         <para>
           Disable or enable automatic purging of relay logs as soon as
           they are no longer needed. The default value is 1 (enabled).

@@ -945,6 +955,8 @@
           <option role="mysqld">--relay-log-recovery={0|1}</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:relay-log-recovery"/>
+
         <para>
           Enables automatic relay log recovery immediately following
           server startup, which means that the replication slave

@@ -970,6 +982,8 @@
           <option role="mysqld">--relay-log-space-limit=<replaceable>size</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:relay-log-space-limit"/>
+
         <para>
           This option places an upper limit on the total size in bytes
           of all relay logs on the slave. A value of 0 means <quote>no

@@ -1014,6 +1028,8 @@
           <option role="mysqld">--replicate-do-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:replicate-do-db"/>
+
         <para>
           The effects of this option depend on whether statement-based
           or row-based replication is in use.

@@ -1055,12 +1071,14 @@
           and you issue the following statements on the master, the
           <literal role="stmt">UPDATE</literal> statement is
           <emphasis>not</emphasis> replicated:
+        </para>
 
 <programlisting>
 USE prices;
 UPDATE sales.january SET amount=amount+1000;
 </programlisting>
 
+        <para>
           The main reason for this <quote>check just the default
           database</quote> behavior is that it is difficult from the
           statement alone to know whether it should be replicated (for

@@ -1171,6 +1189,14 @@
             format on the behavior of
             <option role="mysqld">--binlog-do-db</option>.
           </para>
+
+          <para>
+            This option has no effect on
+            <literal role="stmt" condition="commit">BEGIN</literal>,
+            <literal role="stmt">COMMIT</literal>, or
+            <literal role="stmt" condition="commit">ROLLBACK</literal>
+            statements.
+          </para>
         </note>
       </listitem>
 

@@ -1189,6 +1215,8 @@
           <option role="mysqld">--replicate-ignore-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:replicate-ignore-db"/>
+
         <para>
           As with <option role="mysqld">--replicate-do-db</option>, the
           effects of this option depend on whether statement-based or

@@ -1279,6 +1307,14 @@
             logging format on the behavior of
             <option role="mysqld">--binlog-ignore-db</option>.
           </para>
+
+          <para>
+            This option has no effect on
+            <literal role="stmt" condition="commit">BEGIN</literal>,
+            <literal role="stmt">COMMIT</literal>, or
+            <literal role="stmt" condition="commit">ROLLBACK</literal>
+            statements.
+          </para>
         </note>
       </listitem>
 

@@ -1297,6 +1333,8 @@
           <option role="mysqld">--replicate-do-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:replicate-do-table"/>
+
         <para>
           Tells the slave SQL thread to restrict replication to the
           specified table. To specify more than one table, use this

@@ -1330,6 +1368,8 @@
           <option role="mysqld">--replicate-ignore-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:replicate-ignore-table"/>
+
         <para>
           Tells the slave SQL thread not to replicate any statement that
           updates the specified table, even if any other tables might be

@@ -1364,6 +1404,8 @@
           <option role="mysqld">--replicate-rewrite-db=<replaceable>from_name</replaceable>-&gt;<replaceable>to_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:replicate-rewrite-db"/>
+
         <para>
           Tells the slave to translate the default database (that is,
           the one selected by <literal role="stmt">USE</literal>) to

@@ -1408,6 +1450,8 @@
           <option role="mysqld">--replicate-same-server-id</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:replicate-same-server-id"/>
+
         <para>
           To be used on slave servers. Usually you should use the
           default setting of 0, to prevent infinite loops caused by

@@ -1440,6 +1484,8 @@
           <option role="mysqld">--replicate-wild-do-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:replicate-wild-do-table"/>
+
         <para>
           Tells the slave thread to restrict replication to statements
           where any of the updated tables match the specified database

@@ -1512,6 +1558,8 @@
           <option role="mysqld">--replicate-wild-ignore-table=<replaceable>db_name.tbl_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:replicate-wild-ignore-table"/>
+
         <para>
           Tells the slave thread not to replicate a statement where any
           table matches the given wildcard pattern. To specify more than

@@ -1554,6 +1602,8 @@
           <option role="mysqld">--report-host=<replaceable>host_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:report-host"/>
+
         <para>
           The host name or IP address of the slave to be reported to the
           master during slave registration. This value appears in the

@@ -1582,6 +1632,8 @@
           <option role="mysqld">--report-password=<replaceable>password</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:report-password"/>
+
         <para>
           The account password of the slave to be reported to the master
           during slave registration. This value appears in the output of

@@ -1607,6 +1659,8 @@
           <option role="mysqld">--report-port=<replaceable>slave_port_num</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:report-port"/>
+
         <para>
           The TCP/IP port number for connecting to the slave, to be
           reported to the master during slave registration. Set this

@@ -1631,6 +1685,8 @@
           <option role="mysqld">--report-user=<replaceable>user_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:report-user"/>
+
         <para>
           The account user name of the slave to be reported to the
           master during slave registration. This value appears in the

@@ -1656,6 +1712,8 @@
           <option role="mysqld">--show-slave-auth-info</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:show-slave-auth-info"/>
+
         <para>
           Display slave user names and passwords in the output of
           <literal role="stmt">SHOW SLAVE HOSTS</literal> on the master

@@ -1680,6 +1738,8 @@
           <option role="mysqld">--skip-slave-start</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:skip-slave-start"/>
+
         <para>
           Tells the slave server not to start the slave threads when the
           server starts. To start the threads later, use a

@@ -1702,6 +1762,8 @@
           <option role="sysvar">--slave_compressed_protocol={0|1}</option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:slave_compressed_protocol"/>
+
         <para>
           If this option is set to 1, use compression for the
           slave/master protocol if both the slave and the master support

@@ -1724,6 +1786,8 @@
           <option role="mysqld">--slave-load-tmpdir=<replaceable>file_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:slave-load-tmpdir"/>
+
         <para>
           The name of the directory where the slave creates temporary
           files. This option is by default equal to the value of the

@@ -1768,6 +1832,8 @@
           <option role="mysqld">--slave-net-timeout=<replaceable>seconds</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:slave-net-timeout"/>
+
         <para>
           The number of seconds to wait for more data from the master
           before the slave considers the connection broken, aborts the

@@ -1875,67 +1941,67 @@
     <itemizedlist>
 
       <listitem>
-        <para>
+        <para id="option_mysqld_master-host">
           <option>--master-host</option>
         </para>
       </listitem>
 
       <listitem>
-        <para>
+        <para id="option_mysqld_master-user">
           <option>--master-user</option>
         </para>
       </listitem>
 
       <listitem>
-        <para>
+        <para id="option_mysqld_master-password">
           <option>--master-password</option>
         </para>
       </listitem>
 
       <listitem>
-        <para>
+        <para id="option_mysqld_master-port">
           <option>--master-port</option>
         </para>
       </listitem>
 
       <listitem>
-        <para>
+        <para id="option_mysqld_master-connect-retry">
           <option>--master-connect-retry</option>
         </para>
       </listitem>
 
       <listitem>
-        <para>
+        <para id="option_mysqld_master-ssl">
           <option>--master-ssl</option>
         </para>
       </listitem>
 
       <listitem>
-        <para>
+        <para id="option_mysqld_master-ssl-ca">
           <option>--master-ssl-ca</option>
         </para>
       </listitem>
 
       <listitem>
-        <para>
+        <para id="option_mysqld_master-ssl-capath">
           <option>--master-ssl-capath</option>
         </para>
       </listitem>
 
       <listitem>
-        <para>
+        <para id="option_mysqld_master-ssl-cert">
           <option>--master-ssl-cert</option>
         </para>
       </listitem>
 
       <listitem>
-        <para>
+        <para id="option_mysqld_master-ssl-cipher">
           <option>--master-ssl-cipher</option>
         </para>
       </listitem>
 
       <listitem>
-        <para>
+        <para id="option_mysqld_master-ssl-key">
           <option>--master-ssl-key</option>
         </para>
       </listitem>

@@ -1997,6 +2063,54 @@
       </listitem>
 
       <listitem>
+        <para id="sysvar_relay_log_index">
+          <indexterm>
+            <primary>relay_log_index system variable</primary>
+          </indexterm>
+
+          <indexterm>
+            <primary>system variable</primary>
+            <secondary>relay_log_index</secondary>
+          </indexterm>
+
+          <literal role="sysvar">relay_log_index</literal>
+        </para>
+
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:relay_log_index"/>
+
+        <para>
+          The name of the relay log index file. The default name is
+          <filename><replaceable>host_name</replaceable>-relay-bin.index</filename>
+          in the data directory, where
+          <replaceable>host_name</replaceable> is the name of the slave
+          server.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para id="sysvar_relay_log_info_file">
+          <indexterm>
+            <primary>relay_log_info_file system variable</primary>
+          </indexterm>
+
+          <indexterm>
+            <primary>system variable</primary>
+            <secondary>relay_log_info_file</secondary>
+          </indexterm>
+
+          <literal role="sysvar">relay_log_info_file</literal>
+        </para>
+
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:relay_log_info_file"/>
+
+        <para>
+          The name of the file in which the slave records information
+          about the relay logs. The default name is
+          <filename>relay-log.info</filename> in the data directory.
+        </para>
+      </listitem>
+
+      <listitem>
         <para id="sysvar_relay_log_recovery">
           <indexterm>
             <primary>system variable</primary>

@@ -2010,6 +2124,8 @@
           <literal role="sysvar">relay_log_recovery</literal>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:relay_log_recovery"/>
+
         <para>
           Enables automatic relay log recovery immediately following
           server startup, which means that the replication slave

@@ -2029,7 +2145,7 @@
         </para>
 
         <para>
-          This variable is unused.
+          This variable is unused, and is removed in MySQL 5.6.
         </para>
       </listitem>
 

@@ -2556,6 +2672,8 @@
           <option role="mysqld">--binlog-do-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:binlog-do-db"/>
+
         <para>
           This option affects binary logging in a manner similar to the
           way that <option role="mysqld">--replicate-do-db</option>

@@ -2753,6 +2871,8 @@
           <option role="mysqld">--binlog-ignore-db=<replaceable>db_name</replaceable></option>
         </para>
 
+        <para condition="dynamic:optvar:item" role="6.0:mysqld:binlog-ignore-db"/>
+
         <para>
           This option affects binary logging in a manner similar to the
           way that <option role="mysqld">--replicate-ignore-db</option>

@@ -2826,9 +2946,8 @@
           are <emphasis>not</emphasis> written to the binary log, which
           means that no changes to the <literal>sales.january</literal>
           table are logged; in this instance,
-          <option
-                role="mysqld">--binlog-ignore-db=sales</option>
-          causes <emphasis>all</emphasis> changes made to tables in the
+          <option role="mysqld">--binlog-ignore-db=sales</option> causes
+          <emphasis>all</emphasis> changes made to tables in the
           master&apos;s copy of the <literal>sales</literal> database to
           be ignored for purposes of binary logging.
         </para>

@@ -2994,8 +3113,7 @@
           Beginning with MySQL 6.0.14, the
           <literal role="sysvar">binlog_direct_non_transactional_updates</literal>
           variable offers one possible workaround to this issue. By
-          default, this variable is disabled. By default, this variable
-          is disabled. Enabling
+          default, this variable is disabled. Enabling
           <literal role="sysvar">binlog_direct_non_transactional_updates</literal>
           causes updates to nontransactional tables to be written
           directly to the binary log, rather than to the transaction

@@ -3032,9 +3150,9 @@
         </important>
 
         <para>
-          This variable has no effect when the binary log format is
-          <literal>ROW</literal> or <literal>MIXED</literal>.
-          (Bug#51291)
+          In MySQL &current-series;, this variable has no effect when
+          the binary log format is <literal>ROW</literal> or
+          <literal>MIXED</literal>. (Bug#51291)
         </para>
       </listitem>
 

@@ -3091,7 +3209,7 @@
 
         <para>
           When <literal>MIXED</literal> is specified, statement-based
-          replication is used except for cases where only row-based
+          replication is used, except for cases where only row-based
           replication is guaranteed to lead to proper results. For
           example, this happens when statements contain user-defined
           functions (UDF) or the <literal role="func">UUID()</literal>


Thread
svn commit - mysqldoc@docsrva: r24972 - in trunk: dynamic-docs/command-optvars refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0jon.stephens3 Feb