List:Commits« Previous MessageNext Message »
From:jon.stephens Date:May 2 2011 12:19pm
Subject:svn commit - mysqldoc@oter02: r26101 - trunk/refman-5.6
View as plain text  
Author: js221926
Date: 2011-05-02 14:19:30 +0200 (Mon, 02 May 2011)
New Revision: 26101

Log:

Updated descriptions of master.info, mysql.slave_master_info, SHOW SLAVE STATUS

(Thanks, Luis!)

Fixed typo generating bad idref



Modified:
   trunk/refman-5.6/replication-implementation.xml
   trunk/refman-5.6/replication-options-core.xml
   trunk/refman-5.6/sql-syntax-replication.xml


Modified: trunk/refman-5.6/replication-implementation.xml
===================================================================
--- trunk/refman-5.6/replication-implementation.xml	2011-04-29 22:54:07 UTC (rev 26100)
+++ trunk/refman-5.6/replication-implementation.xml	2011-05-02 12:19:30 UTC (rev 26101)
Changed blocks: 1, Lines Added: 25, Lines Deleted: 0; 1896 bytes

@@ -723,12 +723,37 @@
               <entry>Whether to verify the server certificate</entry>
             </row>
             <row>
+              <entry>16</entry>
+              <entry><literal>Heartbeat</literal></entry>
+              <entry>[None]</entry>
+              <entry>Interval between replication heartbeats, in seconds</entry>
+            </row>
+            <row>
               <entry>17</entry>
+              <entry><literal>Bind</literal></entry>
+              <entry><literal>Master_Bind</literal></entry>
+              <entry>Which of the slave&apos;s network interfaces should be used for
+                connecting to the master</entry>
+            </row>
+            <row>
+              <entry>18</entry>
               <entry><literal>Ignored_server_ids</literal></entry>
               <entry><literal>Replicate_Ignore_Server_Ids</literal></entry>
               <entry>The number of server IDs to be ignored, followed by the actual server
                 IDs</entry>
             </row>
+            <row>
+              <entry>19</entry>
+              <entry><literal>Uuid</literal></entry>
+              <entry><literal>Master_UUID</literal></entry>
+              <entry>The master&apos;s unique ID</entry>
+            </row>
+            <row>
+              <entry>20</entry>
+              <entry><literal>Retry_count</literal></entry>
+              <entry><literal>Master_Retry_Count</literal></entry>
+              <entry>Maximum number of reconnection attempts permitted (Added in MySQL 5.6.1)</entry>
+            </row>
           </tbody>
         </tgroup>
       </informaltable>


Modified: trunk/refman-5.6/replication-options-core.xml
===================================================================
--- trunk/refman-5.6/replication-options-core.xml	2011-04-29 22:54:07 UTC (rev 26100)
+++ trunk/refman-5.6/replication-options-core.xml	2011-05-02 12:19:30 UTC (rev 26101)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 754 bytes

@@ -3896,7 +3896,7 @@
         <para>
           In MySQL &current-series;, the visibility to sessions of
           <literal>max_binlog_cache_size</literal> matches that of the
-          <literal role="sysvar">binlog_cache</literal> size system
+          <literal role="sysvar">binlog_cache_size</literal> system
           variable; in other words, changing its value effects only new
           sessions that are started after the value is changed.
         </para>


Modified: trunk/refman-5.6/sql-syntax-replication.xml
===================================================================
--- trunk/refman-5.6/sql-syntax-replication.xml	2011-04-29 22:54:07 UTC (rev 26100)
+++ trunk/refman-5.6/sql-syntax-replication.xml	2011-05-02 12:19:30 UTC (rev 26101)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 0; 810 bytes

@@ -636,6 +636,13 @@
       </para>
 
       <para>
+        If you are logging master connection information to tables,
+        <literal>MASTER_HEARTBEAT_PERIOD</literal> can be seen as the
+        value of the <literal>Heartbeat</literal> column of the
+        <literal>mysql.slave_master_info</literal> table.
+      </para>
+
+      <para>
         Setting <replaceable>interval</replaceable> to 0 disables
         heartbeats altogether. The default value for
         <replaceable>interval</replaceable> is equal to the value of


Thread
svn commit - mysqldoc@oter02: r26101 - trunk/refman-5.6jon.stephens2 May