List:Commits« Previous MessageNext Message »
From:jon.stephens Date:March 31 2011 6:29pm
Subject:svn commit - mysqldoc@oter02: r25653 - in trunk: dynamic-docs/changelog dynamic-docs/command-optvars refman-5.6
View as plain text  
Author: js221926
Date: 2011-03-31 20:29:07 +0200 (Thu, 31 Mar 2011)
New Revision: 25653

Log:

Documentation for replication WL#3127
    (Slave address binding / MASTER_BIND)

  Updated CHANGE MASTER TO Syntax with new MASTER_BIND option

  Noted equivalent SHOW SLAVE STATUS and mysql.slave_master_info columns

  Changelog and What's New entries

  Related: There is no "--master-bind" option in any MySQL version; removed 
  from optvars file (Thanks, Magnus!)





Modified:
   trunk/dynamic-docs/changelog/mysqld-2.xml
   trunk/dynamic-docs/changelog/mysqld.xml
   trunk/dynamic-docs/command-optvars/mysqld.xml
   trunk/refman-5.6/introduction.xml
   trunk/refman-5.6/sql-syntax-replication.xml
   trunk/refman-5.6/sql-syntax-server-administration.xml


Modified: trunk/dynamic-docs/changelog/mysqld-2.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-2.xml	2011-03-31 18:09:34 UTC (rev 25652)
+++ trunk/dynamic-docs/changelog/mysqld-2.xml	2011-03-31 18:29:07 UTC (rev 25653)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1060 bytes

@@ -106,8 +106,8 @@
         <option role="mysqld">--relay-log-info-repository</option>
         server options. When
         <option role="mysqld">--master-info-repository</option> is set
-        to TABLE, connection information is logged in the
-        <literal>slave_master_info</literal> table in the
+        to <literal>TABLE</literal>, connection information is logged in
+        the <literal>slave_master_info</literal> table in the
         <literal>mysql</literal> system database. When
         <option role="mysqld">--relay-log-info-repository</option> is
         set to <literal>TABLE</literal>, relay log information is logged

@@ -130,7 +130,7 @@
 
     <bugs>
       <fixes wlid="5493"/>
-      <seealsobug wlid="2540"/>
+      <fixes wlid="2540"/>
     </bugs>
 
     <versions>


Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml	2011-03-31 18:09:34 UTC (rev 25652)
+++ trunk/dynamic-docs/changelog/mysqld.xml	2011-03-31 18:29:07 UTC (rev 25653)
Changed blocks: 1, Lines Added: 26, Lines Deleted: 5; 1924 bytes

@@ -4571,28 +4571,49 @@
     </tags>
 
     <bugs>
+      <fixes wlid="3127"/>
       <fixes bugid="25939"/>
     </bugs>
 
     <versions>
       <version ver="5.1.22-ndb-6.3.4"/>
+      <version ver="5.6.2"/>
     </versions>
 
-    <message>
+    <message ver="5.1.22-ndb-6.3.4">
 
       <para>
         On MySQL replication slaves having multiple network interfaces,
         it is now possible to set which interface to use for connecting
-        to the master. This can be done by using either the
-        <command>mysqld</command> startup option
-        <option>--master-bind</option> or the
+        to the master using the
         <literal>MASTER_BIND='<replaceable>interface</replaceable>'</literal>
-        clause in a <literal role="stmt">CHANGE MASTER TO</literal>
+        option in a <literal role="stmt">CHANGE MASTER TO</literal>
         statement.
       </para>
 
     </message>
 
+    <message ver="5.6.2">
+
+      <para>
+        On MySQL replication slaves having multiple network interfaces,
+        it is now possible to set which interface to use for connecting
+        to the master using the
+        <literal>MASTER_BIND='<replaceable>interface</replaceable>'</literal>
+        option in a <literal role="stmt">CHANGE MASTER TO</literal>
+        statement.
+      </para>
+
+      <para>
+        The value set by this option can be seen in the
+        <literal>Master_Bind</literal> column of the output from
+        <literal role="stmt">SHOW SLAVE STATUS</literal> or the
+        <literal>Bind</literal> column of the
+        <literal>mysql.slave_master_info</literal> table.
+      </para>
+
+    </message>
+
   </logentry>
 
   <logentry entrytype="bug">


Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml	2011-03-31 18:09:34 UTC (rev 25652)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml	2011-03-31 18:29:07 UTC (rev 25653)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 29; 1245 bytes

@@ -15499,36 +15499,8 @@
 
   </mysqloption>
 
-  <mysqloption section="replication" id="master-bind">
+  
 
-    <xrefto id="replication-options"/>
-
-    <name>master-bind</name>
-
-    <shortdescription>
-      The network interface which is to be used for connecting to the
-      master by a replication slave having multiple network connections
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--master-bind=name"/>
-      <optype class="mycnf"/>
-      <vartype class="system" isdynamic="no" scope="global"/>
-    </types>
-
-    <values vartype="string" platform="all"/>
-
-    <versions>
-      <manual version="5.1"/>
-      <introduced version="5.1.22-ndb-6.3.4"/>
-      <manual version="5.4"/>
-      <manual version="5.5"/>
-      <manual version="5.6"/>
-      <manual version="6.0"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="replication" id="master-connect-retry">
 
     <xrefto id="option_mysqld_master-connect-retry"/>


Modified: trunk/refman-5.6/introduction.xml
===================================================================
--- trunk/refman-5.6/introduction.xml	2011-03-31 18:09:34 UTC (rev 25652)
+++ trunk/refman-5.6/introduction.xml	2011-03-31 18:29:07 UTC (rev 25653)
Changed blocks: 1, Lines Added: 10, Lines Deleted: 0; 722 bytes

@@ -609,6 +609,16 @@
         </para>
       </listitem>
 
+      <listitem>
+        <para>
+          A replication slave having multiple network interfaces can now
+          be caused to use only one of these (to the exclusion of the
+          others) by using the <literal>MASTER_BIND</literal> option
+          when issuing a <literal role="stmt">CHANGE MASTER TO</literal>
+          statement.
+        </para>
+      </listitem>
+
     </itemizedlist>
 
     <bridgehead>


Modified: trunk/refman-5.6/sql-syntax-replication.xml
===================================================================
--- trunk/refman-5.6/sql-syntax-replication.xml	2011-03-31 18:09:34 UTC (rev 25652)
+++ trunk/refman-5.6/sql-syntax-replication.xml	2011-03-31 18:29:07 UTC (rev 25653)
Changed blocks: 5, Lines Added: 28, Lines Deleted: 27; 4521 bytes

@@ -422,19 +422,10 @@
         <primary>CHANGE MASTER TO</primary>
       </indexterm>
 
-      <remark role="note">
-        [js] Commented out references to MASTER_BIND option since this
-        isn't (yet?) supported in 5.4 (verified by inspecting
-        sql/sql_yacc.h and sql/lex.h)
-      </remark>
-
       <remark role="help-topic" condition="CHANGE MASTER TO"/>
 
       <remark role="help-keywords">
-        CHANGE MASTER TO IGNORE_SERVER_IDS
-
-<!--MASTER_BIND-->
-
+        CHANGE MASTER TO IGNORE_SERVER_IDS MASTER_BIND
         MASTER_HEARTBEAT_PERIOD MASTER_HOST MASTER_USER MASTER_PASSWORD
         MASTER_PORT MASTER_LOG_FILE MASTER_LOG_POS MASTER_CONNECT_RETRY
         MASTER_RETRY_COUNT RELAY_LOG_POS RELAY_LOG_FILE MASTER_SSL

@@ -448,11 +439,8 @@
 CHANGE MASTER TO <replaceable>option</replaceable> [, <replaceable>option</replaceable>] ...
 
 <replaceable>option</replaceable>:
-<!--
     MASTER_BIND = '<replaceable>interface_name</replaceable>'
-  |
--->
-    MASTER_HOST = '<replaceable>host_name</replaceable>'
+  | MASTER_HOST = '<replaceable>host_name</replaceable>'
   | MASTER_USER = '<replaceable>user_name</replaceable>'
   | MASTER_PASSWORD = '<replaceable>password</replaceable>'
   | MASTER_PORT = <replaceable>port_num</replaceable>

@@ -613,7 +601,6 @@
         This option was added in MySQL 5.6.0.
       </para>
 
-<!--
       <para>
         <literal>MASTER_BIND</literal> is for use on replication slaves
         having multiple network interfaces, and determines which of the

@@ -622,9 +609,23 @@
         is to be used in such cases by starting the slave mysqld process
         with the <option>&ddash;master-bind</option> option.
       </para>
--->
 
       <para>
+        The address configured with this option, if any, can be seen in
+        the <literal>Master_Bind</literal> column of the output from
+        <literal role="stmt">SHOW SLAVE STATUS</literal>. If you are
+        using slave status log tables (server started with
+        <option role="mysqld">--master-info-repository=TABLE</option>),
+        the value can also be seen as the <literal>Master_bind</literal>
+        column of the <literal>mysql.slave_master_info</literal> table.
+      </para>
+
+      <para>
+        The ability to bind a replication slave to a specific network
+        interface was added in MySQL 5.6.2.
+      </para>
+
+      <para>
         <literal>MASTER_HEARTBEAT_PERIOD</literal> sets the interval in
         seconds between replication heartbeats. Whenever the master's
         binary log is updated with an event, the waiting period for the

@@ -706,20 +707,20 @@
         servers, having server IDs 1, 2, 3, and 4, and server 3 fails.
         When bridging the gap by starting replication from server 2 to
         server 4, you can include <literal>IGNORE_SERVER_IDS =
-        (3)</literal> in the <literal>CHANGE MASTER TO</literal>
-        statement that you issue on server 4 to tell it to use server 2
-        as its master instead of server 3. Doing so causes it to ignore
-        and not to propagate any statements that originated with the
-        server that is no longer in use.
+        (3)</literal> in the <literal role="stmt">CHANGE MASTER
+        TO</literal> statement that you issue on server 4 to tell it to
+        use server 2 as its master instead of server 3. Doing so causes
+        it to ignore and not to propagate any statements that originated
+        with the server that is no longer in use.
       </para>
 
       <para>
-        If a <literal>CHANGE MASTER TO</literal> statement is issued
-        without any <literal>IGNORE_SERVER_IDS</literal> option, any
-        existing list is preserved; <literal role="stmt">RESET
-        SLAVE</literal> also has no effect on the server ID list. To
-        clear the list of ignored servers, it is necessary to use the
-        option with an empty list:
+        If a <literal role="stmt">CHANGE MASTER TO</literal> statement
+        is issued without any <literal>IGNORE_SERVER_IDS</literal>
+        option, any existing list is preserved;
+        <literal role="stmt">RESET SLAVE</literal> also has no effect on
+        the server ID list. To clear the list of ignored servers, it is
+        necessary to use the option with an empty list:
       </para>
 
 <programlisting>


Modified: trunk/refman-5.6/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.6/sql-syntax-server-administration.xml	2011-03-31 18:09:34 UTC (rev 25652)
+++ trunk/refman-5.6/sql-syntax-server-administration.xml	2011-03-31 18:29:07 UTC (rev 25653)
Changed blocks: 1, Lines Added: 17, Lines Deleted: 0; 921 bytes

@@ -8914,6 +8914,23 @@
 
         <listitem>
           <para>
+            <literal>Master_Bind</literal>
+          </para>
+
+          <para>
+            Shows the network interface that the client is bound to, if
+            any, set using the <literal>MASTER_BIND</literal> option for
+            the <literal role="stmt">CHANGE MASTER TO</literal>
+            statement.
+          </para>
+
+          <para>
+            This column was added in MySQL 5.6.2.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
             <literal>Last_IO_Error_Timestamp</literal>
           </para>
 


Thread
svn commit - mysqldoc@oter02: r25653 - in trunk: dynamic-docs/changelog dynamic-docs/command-optvars refman-5.6jon.stephens31 Mar