List:Commits« Previous MessageNext Message »
From:jon Date:July 25 2008 10:06am
Subject:svn commit - mysqldoc@docsrva: r11374 - in trunk: refman-5.1 refman-common/images/published
View as plain text  
Author: jstephens
Date: 2008-07-25 10:06:54 +0200 (Fri, 25 Jul 2008)
New Revision: 11374

Log:

WL#4453: Added/updated image, some additional work on text, misc
formatting/cleanup



Added:
   trunk/refman-common/images/published/cluster-replication-multi-master-mysqlds.png
Modified:
   trunk/refman-5.1/mysql-cluster-replication.xml

Property changes on: trunk/refman-common/images/published/cluster-replication-multi-master-mysqlds.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


Modified: trunk/refman-5.1/mysql-cluster-replication.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-replication.xml	2008-07-25 06:45:43 UTC (rev 11373)
+++ trunk/refman-5.1/mysql-cluster-replication.xml	2008-07-25 08:06:54 UTC (rev 11374)
Changed blocks: 3, Lines Added: 28, Lines Deleted: 11; 3101 bytes

@@ -2415,14 +2415,14 @@
   </section>
 
 <!--
+  <section id="mysql-cluster-replication-multi-master">
+
+    <title>Multi-Master and Circular Replication</title>
+
     <remark role="TODO">
       [js] WL#4453: Uncomment this section
     </remark>
-  
-    <section id="mysql-cluster-replication-multi-master">
 
-    <title>Multi-Master and Circular Replication</title>
-
     <para>
       Beginning with MySQL 5.1.18, it is possible to use MySQL Cluster
       in multi-master replication, including circular replication

@@ -2552,8 +2552,11 @@
       <title>Multi-master failover example</title>
 
       <para>
-        In this section, we discuss failing over in a multi-master MySQL Cluster
-        replication setup such as that shown here:
+        In this section, we discuss failover in a multi-master MySQL
+        Cluster replication setup with three MySQL Clusters 1, 2, and 3.
+        In this scenario, Cluster 1 replicates to Clusters 2 and 3;
+        Cluster 2 also replicates to Cluster 3. This relationship is
+        shown here:
 
         <mediaobject>
           <imageobject>

@@ -2569,28 +2572,42 @@
     </formalpara>
 
     <para>
+      Not all MySQL servers taking part in multi-master replication must
+      act as both master and slave, and a given MySQL Cluster might use
+      different SQL nodes for diffferent replication channels. This is
+      shown here:
+
       <mediaobject>
         <imageobject>
-          <imagedata fileref="../refman-common/images/published/cluster-replication-log-slave-updates.png" format="PNG"/>
+          <imagedata fileref="../refman-common/images/published/cluster-replication-multi-master-mysqlds.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase lang="EN">Multi-master MySQL Cluster replication
           setup, detail with MySQL Servers</phrase>
         </textobject>
       </mediaobject>
+
+      MySQL servers acting as replication slaves must be run with the
+      <option>&ddash;log-slave-updates</option> option. Which
+      <command>mysqld</command> processes require this option is also
+      shown in the preceding diagram.
     </para>
 
     <note>
       <para>
-        Replication slaves must be run with the
-        <option>&ddash;log-slave-updates</option> option. Using this option
-        has no effect on servers not being run as replication slaves.
+        Using the <option>&ddash;log-slave-updates</option> option has
+        no effect on servers not being run as replication slaves.
       </para>
     </note>
 
+    <para>
+      The need for failover arises when one of the replicating clusters
+      goes down. Here, we consider the case where Cluster 1 is lost.
+    </para>
+
   </section>
 -->
-
+  
   <section id="mysql-cluster-replication-conflict-resolution">
 
     <title>MySQL Cluster Replication Conflict Resolution</title>


Added: trunk/refman-common/images/published/cluster-replication-multi-master-mysqlds.png
===================================================================


Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 393 bytes


Thread
svn commit - mysqldoc@docsrva: r11374 - in trunk: refman-5.1 refman-common/images/publishedjon25 Jul