List:Commits« Previous MessageNext Message »
From:jon.stephens Date:October 20 2010 10:14am
Subject:svn commit - mysqldoc@docsrva: r23247 - trunk/refman-5.1
View as plain text  
Author: jstephens
Date: 2010-10-20 12:14:13 +0200 (Wed, 20 Oct 2010)
New Revision: 23247

Log:

De-gunking

Fixed misplaced indexterms

Got rid of fake headers

General revisions



Modified:
   trunk/refman-5.1/mysql-cluster-management.xml
   trunk/refman-5.1/mysql-cluster-multi-computer.xml
   trunk/refman-5.1/mysql-cluster-overview.xml
   trunk/refman-5.1/mysql-cluster-replication-core.xml
   trunk/refman-5.1/mysql-cluster.xml


Modified: trunk/refman-5.1/mysql-cluster-management.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-management.xml	2010-10-20 02:24:35 UTC (rev 23246)
+++ trunk/refman-5.1/mysql-cluster-management.xml	2010-10-20 10:14:13 UTC (rev 23247)
Changed blocks: 32, Lines Added: 217, Lines Deleted: 217; 20120 bytes

@@ -546,16 +546,16 @@
     <itemizedlist>
 
       <listitem>
-        <indexterm>
-          <primary>MySQL Cluster</primary>
-          <secondary>HELP command</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>MySQL Cluster</primary>
+            <secondary>HELP command</secondary>
+          </indexterm>
 
-        <indexterm>
-          <primary>HELP command (MySQL Cluster)</primary>
-        </indexterm>
+          <indexterm>
+            <primary>HELP command (MySQL Cluster)</primary>
+          </indexterm>
 
-        <para>
           <literal role="ndb_mgm_cmd">HELP</literal>
         </para>
 

@@ -565,16 +565,16 @@
       </listitem>
 
       <listitem>
-        <indexterm>
-          <primary>MySQL Cluster</primary>
-          <secondary>SHOW command</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>MySQL Cluster</primary>
+            <secondary>SHOW command</secondary>
+          </indexterm>
 
-        <indexterm>
-          <primary>SHOW command (MySQL Cluster)</primary>
-        </indexterm>
+          <indexterm>
+            <primary>SHOW command (MySQL Cluster)</primary>
+          </indexterm>
 
-        <para>
           <literal role="ndb_mgm_cmd">SHOW</literal>
         </para>
 

@@ -598,16 +598,16 @@
       </listitem>
 
       <listitem>
-        <indexterm>
-          <primary>MySQL Cluster</primary>
-          <secondary>START command</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>MySQL Cluster</primary>
+            <secondary>START command</secondary>
+          </indexterm>
 
-        <indexterm>
-          <primary>START command (MySQL Cluster)</primary>
-        </indexterm>
+          <indexterm>
+            <primary>START command (MySQL Cluster)</primary>
+          </indexterm>
 
-        <para>
           <literal><replaceable>node_id</replaceable> START</literal>
         </para>
 

@@ -631,16 +631,16 @@
       </listitem>
 
       <listitem>
-        <indexterm>
-          <primary>MySQL Cluster</primary>
-          <secondary>STOP command</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>MySQL Cluster</primary>
+            <secondary>STOP command</secondary>
+          </indexterm>
 
-        <indexterm>
-          <primary>STOP command (MySQL Cluster)</primary>
-        </indexterm>
+          <indexterm>
+            <primary>STOP command (MySQL Cluster)</primary>
+          </indexterm>
 
-        <para>
           <literal><replaceable>node_id</replaceable> STOP [-a]
           [-f]</literal>
         </para>

@@ -690,16 +690,16 @@
       </listitem>
 
       <listitem>
-        <indexterm>
-          <primary>MySQL Cluster</primary>
-          <secondary>RESTART command</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>MySQL Cluster</primary>
+            <secondary>RESTART command</secondary>
+          </indexterm>
 
-        <indexterm>
-          <primary>RESTART command (MySQL Cluster)</primary>
-        </indexterm>
+          <indexterm>
+            <primary>RESTART command (MySQL Cluster)</primary>
+          </indexterm>
 
-        <para>
           <literal><replaceable>node_id</replaceable> RESTART [-n] [-i]
           [-a] [-f]</literal>
         </para>

@@ -748,16 +748,16 @@
       </listitem>
 
       <listitem>
-        <indexterm>
-          <primary>MySQL Cluster</primary>
-          <secondary>STATUS command</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>MySQL Cluster</primary>
+            <secondary>STATUS command</secondary>
+          </indexterm>
 
-        <indexterm>
-          <primary>STATUS command (MySQL Cluster)</primary>
-        </indexterm>
+          <indexterm>
+            <primary>STATUS command (MySQL Cluster)</primary>
+          </indexterm>
 
-        <para>
           <literal><replaceable>node_id</replaceable> STATUS</literal>
         </para>
 

@@ -774,16 +774,16 @@
       </listitem>
 
       <listitem>
-        <indexterm>
-          <primary>MySQL Cluster</primary>
-          <secondary>REPORT command</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>MySQL Cluster</primary>
+            <secondary>REPORT command</secondary>
+          </indexterm>
 
-        <indexterm>
-          <primary>REPORT command (MySQL Cluster)</primary>
-        </indexterm>
+          <indexterm>
+            <primary>REPORT command (MySQL Cluster)</primary>
+          </indexterm>
 
-        <para>
           <literal><replaceable>node_id</replaceable> REPORT
           <replaceable>report-type</replaceable></literal>
         </para>

@@ -852,25 +852,25 @@
       </listitem>
 
       <listitem>
-        <indexterm>
-          <primary>MySQL Cluster</primary>
-          <secondary>single user mode</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>MySQL Cluster</primary>
+            <secondary>single user mode</secondary>
+          </indexterm>
 
-        <indexterm>
-          <primary>single user mode (MySQL Cluster)</primary>
-        </indexterm>
+          <indexterm>
+            <primary>single user mode (MySQL Cluster)</primary>
+          </indexterm>
 
-        <indexterm>
-          <primary>MySQL Cluster</primary>
-          <secondary>ENTER SINGLE USER MODE command</secondary>
-        </indexterm>
+          <indexterm>
+            <primary>MySQL Cluster</primary>
+            <secondary>ENTER SINGLE USER MODE command</secondary>
+          </indexterm>
 
-        <indexterm>
-          <primary>ENTER SINGLE USER MODE command (MySQL Cluster)</primary>
-        </indexterm>
+          <indexterm>
+            <primary>ENTER SINGLE USER MODE command (MySQL Cluster)</primary>
+          </indexterm>
 
-        <para>
           <literal>ENTER SINGLE USER MODE
           <replaceable>node_id</replaceable></literal>
         </para>

@@ -891,16 +891,16 @@
       </listitem>
 
       <listitem>
-        <indexterm>
-          <primary>MySQL Cluster</primary>
-          <secondary>EXIT SINGLE USER MODE command</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>MySQL Cluster</primary>
+            <secondary>EXIT SINGLE USER MODE command</secondary>
+          </indexterm>
 
-        <indexterm>
-          <primary>EXIT SINGLE USER MODE command (MySQL Cluster)</primary>
-        </indexterm>
+          <indexterm>
+            <primary>EXIT SINGLE USER MODE command (MySQL Cluster)</primary>
+          </indexterm>
 
-        <para>
           <literal>EXIT SINGLE USER MODE</literal>
         </para>
 

@@ -920,25 +920,25 @@
       </listitem>
 
       <listitem>
-        <indexterm>
-          <primary>MySQL Cluster</primary>
-          <secondary>EXIT command</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>MySQL Cluster</primary>
+            <secondary>EXIT command</secondary>
+          </indexterm>
 
-        <indexterm>
-          <primary>EXIT command (MySQL Cluster)</primary>
-        </indexterm>
+          <indexterm>
+            <primary>EXIT command (MySQL Cluster)</primary>
+          </indexterm>
 
-        <indexterm>
-          <primary>MySQL Cluster</primary>
-          <secondary>QUIT command</secondary>
-        </indexterm>
+          <indexterm>
+            <primary>MySQL Cluster</primary>
+            <secondary>QUIT command</secondary>
+          </indexterm>
 
-        <indexterm>
-          <primary>QUIT command (MySQL Cluster)</primary>
-        </indexterm>
+          <indexterm>
+            <primary>QUIT command (MySQL Cluster)</primary>
+          </indexterm>
 
-        <para>
           <literal>QUIT</literal>, <literal>EXIT</literal>
         </para>
 

@@ -953,16 +953,16 @@
       </listitem>
 
       <listitem>
-        <indexterm>
-          <primary>MySQL Cluster</primary>
-          <secondary>SHUTDOWN command</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>MySQL Cluster</primary>
+            <secondary>SHUTDOWN command</secondary>
+          </indexterm>
 
-        <indexterm>
-          <primary>SHUTDOWN command (MySQL Cluster)</primary>
-        </indexterm>
+          <indexterm>
+            <primary>SHUTDOWN command (MySQL Cluster)</primary>
+          </indexterm>
 
-        <para>
           <literal>SHUTDOWN</literal>
         </para>
 

@@ -979,16 +979,16 @@
       </listitem>
 
       <listitem>
-        <indexterm>
-          <primary>MySQL Cluster</primary>
-          <secondary>CREATE NODEGROUP command</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>MySQL Cluster</primary>
+            <secondary>CREATE NODEGROUP command</secondary>
+          </indexterm>
 
-        <indexterm>
-          <primary>CREATE NODEGROUP command (MySQL Cluster)</primary>
-        </indexterm>
+          <indexterm>
+            <primary>CREATE NODEGROUP command (MySQL Cluster)</primary>
+          </indexterm>
 
-        <para>
           <literal>CREATE NODEGROUP <replaceable>nodeid</replaceable>[,
           <replaceable>nodeid</replaceable>, ...]</literal>
         </para>

@@ -1027,16 +1027,16 @@
       </listitem>
 
       <listitem>
-        <indexterm>
-          <primary>MySQL Cluster</primary>
-          <secondary>DROP NODEGROUP command</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>MySQL Cluster</primary>
+            <secondary>DROP NODEGROUP command</secondary>
+          </indexterm>
 
-        <indexterm>
-          <primary>DROP NODEGROUP command (MySQL Cluster)</primary>
-        </indexterm>
+          <indexterm>
+            <primary>DROP NODEGROUP command (MySQL Cluster)</primary>
+          </indexterm>
 
-        <para>
           <literal>DROP NODEGROUP
           <replaceable>nodegroup_id</replaceable></literal>
         </para>

@@ -1355,16 +1355,16 @@
       <itemizedlist>
 
         <listitem>
-          <indexterm>
-            <primary>START BACKUP</primary>
-            <secondary>NOWAIT</secondary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>START BACKUP</primary>
+              <secondary>NOWAIT</secondary>
+            </indexterm>
 
-          <indexterm>
-            <primary>NOWAIT (START BACKUP command)</primary>
-          </indexterm>
+            <indexterm>
+              <primary>NOWAIT (START BACKUP command)</primary>
+            </indexterm>
 
-          <para>
             If <literal>NOWAIT</literal> is specified, the management
             client displays a prompt immediately, as seen here:
           </para>

@@ -1381,16 +1381,16 @@
         </listitem>
 
         <listitem>
-          <indexterm>
-            <primary>START BACKUP</primary>
-            <secondary>WAIT STARTED</secondary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>START BACKUP</primary>
+              <secondary>WAIT STARTED</secondary>
+            </indexterm>
 
-          <indexterm>
-            <primary>WAIT STARTED (START BACKUP command)</primary>
-          </indexterm>
+            <indexterm>
+              <primary>WAIT STARTED (START BACKUP command)</primary>
+            </indexterm>
 
-          <para>
             With <literal>WAIT STARTED</literal> the management client
             waits until the backup has started before returning control
             to the user, as shown here:

@@ -1405,16 +1405,16 @@
         </listitem>
 
         <listitem>
-          <indexterm>
-            <primary>START BACKUP</primary>
-            <secondary>WAIT COMPLETED</secondary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>START BACKUP</primary>
+              <secondary>WAIT COMPLETED</secondary>
+            </indexterm>
 
-          <indexterm>
-            <primary>WAIT COMPLETED (START BACKUP command)</primary>
-          </indexterm>
+            <indexterm>
+              <primary>WAIT COMPLETED (START BACKUP command)</primary>
+            </indexterm>
 
-          <para>
             <userinput>WAIT COMPLETED</userinput> causes the management
             client to wait until the backup process is complete before
             returning control to the user.

@@ -1518,17 +1518,17 @@
         </listitem>
 
         <listitem>
-          <indexterm>
-            <primary>native backup and restore</primary>
-            <secondary>backup identifiers</secondary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>native backup and restore</primary>
+              <secondary>backup identifiers</secondary>
+            </indexterm>
 
-          <indexterm>
-            <primary>backup identifiers</primary>
-            <secondary>native backup and restore</secondary>
-          </indexterm>
+            <indexterm>
+              <primary>backup identifiers</primary>
+              <secondary>native backup and restore</secondary>
+            </indexterm>
 
-          <para>
             When the backup has started the management client displays
             this message:
           </para>

@@ -1762,11 +1762,11 @@
       <itemizedlist>
 
         <listitem>
-          <indexterm>
-            <primary>BackupDataBufferSize</primary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>BackupDataBufferSize</primary>
+            </indexterm>
 
-          <para>
             <literal>BackupDataBufferSize</literal>
           </para>
 

@@ -1777,11 +1777,11 @@
         </listitem>
 
         <listitem>
-          <indexterm>
-            <primary>BackupLogBufferSize</primary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>BackupLogBufferSize</primary>
+            </indexterm>
 
-          <para>
             <literal>BackupLogBufferSize</literal>
           </para>
 

@@ -1792,11 +1792,11 @@
         </listitem>
 
         <listitem>
-          <indexterm>
-            <primary>BackupMemory</primary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>BackupMemory</primary>
+            </indexterm>
 
-          <para>
             <literal>BackupMemory</literal>
           </para>
 

@@ -1808,11 +1808,11 @@
         </listitem>
 
         <listitem>
-          <indexterm>
-            <primary>BackupWriteSize</primary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>BackupWriteSize</primary>
+            </indexterm>
 
-          <para>
             <literal>BackupWriteSize</literal>
           </para>
 

@@ -1823,11 +1823,11 @@
         </listitem>
 
         <listitem>
-          <indexterm>
-            <primary>BackupMaxWriteSize</primary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>BackupMaxWriteSize</primary>
+            </indexterm>
 
-          <para>
             <literal>BackupMaxWriteSize</literal>
           </para>
 

@@ -7983,7 +7983,7 @@
 
       <indexterm>
         <primary>SHOW ENGINE</primary>
-        <secondary>used with MySQL Cluster</secondary>
+        <secondary>and MySQL Cluster</secondary>
       </indexterm>
 
       <indexterm>

@@ -8016,12 +8016,12 @@
       </listitem>
 
       <listitem>
-        <indexterm>
-          <primary>SHOW ENGINES</primary>
-          <secondary>used with MySQL Cluster</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>SHOW ENGINES</primary>
+            <secondary>and MySQL Cluster</secondary>
+          </indexterm>
 
-        <para>
           <literal role="stmt">SHOW ENGINES</literal>
         </para>
 

@@ -8049,12 +8049,12 @@
       </listitem>
 
       <listitem>
-        <indexterm>
-          <primary>INFORMATION_SCHEMA.ENGINES table</primary>
-          <secondary>used with MySQL Cluster</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>INFORMATION_SCHEMA.ENGINES table</primary>
+            <secondary>and MySQL Cluster</secondary>
+          </indexterm>
 
-        <para>
           <literal>SELECT * FROM INFORMATION_SCHEMA.ENGINES [WHERE
           ENGINE LIKE 'NDB%']</literal>
         </para>

@@ -8090,12 +8090,12 @@
       </listitem>
 
       <listitem>
-        <indexterm>
-          <primary>SHOW VARIABLES</primary>
-          <secondary>used with MySQL Cluster</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>SHOW VARIABLES</primary>
+            <secondary>and MySQL Cluster</secondary>
+          </indexterm>
 
-        <para>
           <literal>SHOW VARIABLES LIKE 'NDB%'</literal>
         </para>
 

@@ -8132,12 +8132,12 @@
       </listitem>
 
       <listitem>
-        <indexterm>
-          <primary>INFORMATION_SCHEMA.GLOBAL_VARIABLES table</primary>
-          <secondary>used with MySQL Cluster</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>INFORMATION_SCHEMA.GLOBAL_VARIABLES table</primary>
+            <secondary>and MySQL Cluster</secondary>
+          </indexterm>
 
-        <para>
           <literal>SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
           WHERE VARIABLE_NAME LIKE 'NDB%';</literal>
         </para>

@@ -8195,12 +8195,12 @@
       </listitem>
 
       <listitem>
-        <indexterm>
-          <primary>SHOW STATUS</primary>
-          <secondary>used with MySQL Cluster</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>SHOW STATUS</primary>
+            <secondary>and MySQL Cluster</secondary>
+          </indexterm>
 
-        <para>
           <literal>SHOW STATUS LIKE 'NDB%'</literal>
         </para>
 

@@ -8248,12 +8248,12 @@
       </listitem>
 
       <listitem>
-        <indexterm>
-          <primary>INFORMATION_SCHEMA.GLOBAL_STATUS table</primary>
-          <secondary>used with MySQL Cluster</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>INFORMATION_SCHEMA.GLOBAL_STATUS table</primary>
+            <secondary>and MySQL Cluster</secondary>
+          </indexterm>
 
-        <para>
           <literal>SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE
           VARIABLE_NAME LIKE 'NDB%';</literal>
         </para>

@@ -10943,12 +10943,12 @@
       <orderedlist>
 
         <listitem>
-          <indexterm>
-            <primary>MySQL Cluster Disk Data</primary>
-            <secondary>creating log file groups</secondary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>MySQL Cluster Disk Data</primary>
+              <secondary>creating log file groups</secondary>
+            </indexterm>
 
-          <para>
             We create a log file group named <literal>lg_1</literal>
             using <literal role="stmt">CREATE LOGFILE GROUP</literal>.
             This log file group is to be made up of two undo log files,

@@ -11065,12 +11065,12 @@
         </listitem>
 
         <listitem>
-          <indexterm>
-            <primary>MySQL Cluster Disk Data</primary>
-            <secondary>creating tablespaces</secondary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>MySQL Cluster Disk Data</primary>
+              <secondary>creating tablespaces</secondary>
+            </indexterm>
 
-          <para>
             Now we can create a tablespace, which contains files to be
             used by MySQL Cluster Disk Data tables for storing their
             data. A tablespace is also associated with a particular log

@@ -11183,12 +11183,12 @@
         </listitem>
 
         <listitem>
-          <indexterm>
-            <primary>MySQL Cluster Disk Data</primary>
-            <secondary>creating tables</secondary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>MySQL Cluster Disk Data</primary>
+              <secondary>creating tables</secondary>
+            </indexterm>
 
-          <para>
             Now it is possible to create a table whose nonindexed
             columns are stored on disk in the tablespace
             <literal>ts_1</literal>:


Modified: trunk/refman-5.1/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-multi-computer.xml	2010-10-20 02:24:35 UTC (rev 23246)
+++ trunk/refman-5.1/mysql-cluster-multi-computer.xml	2010-10-20 10:14:13 UTC (rev 23247)
Changed blocks: 5, Lines Added: 30, Lines Deleted: 29; 2878 bytes

@@ -117,17 +117,17 @@
         </textobject>
       </mediaobject>
 
-      <indexterm>
-        <primary>MySQL Cluster</primary>
-        <secondary>and IP addressing</secondary>
-      </indexterm>
+      <para>
+        <indexterm>
+          <primary>MySQL Cluster</primary>
+          <secondary>and IP addressing</secondary>
+        </indexterm>
 
-      <indexterm>
-        <primary>MySQL Cluster</primary>
-        <secondary>and DNS</secondary>
-      </indexterm>
+        <indexterm>
+          <primary>MySQL Cluster</primary>
+          <secondary>and DNS</secondary>
+        </indexterm>
 
-      <para>
         In the interest of simplicity (and reliability), this
         <citetitle>How-To</citetitle> uses only numeric IP addresses.
         However, if DNS resolution is available on your network, it is

@@ -980,19 +980,20 @@
 
       </itemizedlist>
 
-      <para>
-        <emphasis role="bold">Configuring the Storage and SQL
-        Nodes</emphasis>
-      </para>
+      <formalpara>
 
-      <para>
-        The <filename>my.cnf</filename> file needed for the data nodes
-        is fairly simple. The configuration file should be located in
-        the <filename>/etc</filename> directory and can be edited using
-        any text editor. (Create the file if it does not exist.) For
-        example:
-      </para>
+        <title>Configuring the storage and SQL nodes</title>
 
+        <para>
+          The <filename>my.cnf</filename> file needed for the data nodes
+          is fairly simple. The configuration file should be located in
+          the <filename>/etc</filename> directory and can be edited
+          using any text editor. (Create the file if it does not exist.)
+          For example:
+        </para>
+
+      </formalpara>
+
 <programlisting>
 shell&gt; <userinput>vi /etc/my.cnf</userinput>
 </programlisting>

@@ -3354,9 +3355,9 @@
         </textobject>
       </mediaobject>
 
-      <para>
-        <emphasis role="bold">Notes: MySQL Cluster NDB 6.x:</emphasis>
-      </para>
+      <bridgehead>
+        Notes: MySQL Cluster NDB 7.x
+      </bridgehead>
 
       <itemizedlist>
 

@@ -3570,9 +3571,9 @@
         </textobject>
       </mediaobject>
 
-      <para>
-        <emphasis role="bold">Notes: MySQL Cluster NDB 6.x:</emphasis>
-      </para>
+      <bridgehead>
+        Notes: MySQL Cluster NDB 6.x
+      </bridgehead>
 
       <itemizedlist>
 

@@ -3775,9 +3776,9 @@
         </textobject>
       </mediaobject>
 
-      <para>
-        <emphasis role="bold">Notes: MySQL 5.1:</emphasis>
-      </para>
+      <bridgehead>
+        Notes: MySQL 5.1
+      </bridgehead>
 
       <itemizedlist>
 


Modified: trunk/refman-5.1/mysql-cluster-overview.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-overview.xml	2010-10-20 02:24:35 UTC (rev 23246)
+++ trunk/refman-5.1/mysql-cluster-overview.xml	2010-10-20 10:14:13 UTC (rev 23247)
Changed blocks: 8, Lines Added: 50, Lines Deleted: 50; 6484 bytes

@@ -4610,27 +4610,27 @@
         </listitem>
 
         <listitem>
-          <indexterm>
-            <primary>MySQL Cluster</primary>
-            <secondary>partitioning support</secondary>
-          </indexterm>
-
-          <indexterm>
-            <primary>partitioning</primary>
-            <secondary>support in MySQL Cluster</secondary>
-          </indexterm>
-
-          <indexterm>
-            <primary>MySQL Cluster limitations</primary>
-            <secondary>partitioning</secondary>
-          </indexterm>
-
           <formalpara>
 
             <title>Creating <literal role="se">NDBCLUSTER</literal> tables with
               user-defined partitioning</title>
 
             <para>
+              <indexterm>
+                <primary>MySQL Cluster</primary>
+                <secondary>partitioning support</secondary>
+              </indexterm>
+
+              <indexterm>
+                <primary>partitioning</primary>
+                <secondary>support in MySQL Cluster</secondary>
+              </indexterm>
+
+              <indexterm>
+                <primary>MySQL Cluster limitations</primary>
+                <secondary>partitioning</secondary>
+              </indexterm>
+
               Support for user-defined partitioning for MySQL Cluster in
               MySQL 5.1 (including MySQL Cluster NDB 6.X and 7.X through
               7.1) is restricted to [<literal>LINEAR</literal>]

@@ -6138,16 +6138,16 @@
         </listitem>
 
         <listitem>
-          <indexterm>
-            <primary>MySQL Cluster limitations</primary>
-            <secondary>replication</secondary>
-          </indexterm>
-
           <formalpara>
 
             <title>Replication with MySQL Cluster</title>
 
             <para>
+              <indexterm>
+                <primary>MySQL Cluster limitations</primary>
+                <secondary>replication</secondary>
+              </indexterm>
+
               It is now possible to use MySQL replication with Cluster
               databases. For details, see
               <xref linkend="mysql-cluster-replication"/>.

@@ -6187,16 +6187,16 @@
         </listitem>
 
         <listitem>
-          <indexterm>
-            <primary>MySQL Cluster limitations</primary>
-            <secondary>autodiscovery</secondary>
-          </indexterm>
-
           <formalpara>
 
             <title>Database autodiscovery and online schema changes</title>
 
             <para>
+              <indexterm>
+                <primary>MySQL Cluster limitations</primary>
+                <secondary>autodiscovery</secondary>
+              </indexterm>
+
               Autodiscovery of databases is now supported for multiple
               MySQL servers accessing the same MySQL Cluster. Formerly,
               autodiscovery in MySQL Cluster 5.1 and MySQL Cluster NDB

@@ -6253,12 +6253,12 @@
 
             <title>Character set directory</title>
 
-            <indexterm>
-              <primary>MySQL Cluster limitations</primary>
-              <secondary>character sets</secondary>
-            </indexterm>
+            <para>
+              <indexterm>
+                <primary>MySQL Cluster limitations</primary>
+                <secondary>character sets</secondary>
+              </indexterm>
 
-            <para>
               Beginning with MySQL 5.1.10, it is possible to install
               MySQL with Cluster support to a nondefault location and
               change the search path for font description files using

@@ -6278,12 +6278,12 @@
 
             <title>Multiple management servers</title>
 
-            <indexterm>
-              <primary>MySQL Cluster limitations</primary>
-              <secondary>multiple management servers</secondary>
-            </indexterm>
+            <para>
+              <indexterm>
+                <primary>MySQL Cluster limitations</primary>
+                <secondary>multiple management servers</secondary>
+              </indexterm>
 
-            <para>
               In MySQL 5.1 (including all MySQL Cluster NDB 6.x and
               later versions), it is no longer necessary, when running
               multiple management servers, to restart all the

@@ -6308,12 +6308,12 @@
 
             <title>Multiple data node processes per host</title>
 
-            <indexterm>
-              <primary>MySQL Cluster limitations</primary>
-              <secondary>multiple data nodes</secondary>
-            </indexterm>
+            <para>
+              <indexterm>
+                <primary>MySQL Cluster limitations</primary>
+                <secondary>multiple data nodes</secondary>
+              </indexterm>
 
-            <para>
               Beginning with MySQL Cluster NDB 6.2.0, you can use
               multiple data node processes on a single host. (In MySQL
               Cluster NDB 6.1, MySQL 5.1, and earlier release series, we

@@ -6357,12 +6357,12 @@
 
             <title>Length of <literal role="stmt">CREATE TABLE</literal> statements</title>
 
-            <indexterm>
-              <primary>MySQL Cluster limitations</primary>
-              <secondary>CREATE TABLE statements</secondary>
-            </indexterm>
+            <para>
+              <indexterm>
+                <primary>MySQL Cluster limitations</primary>
+                <secondary>CREATE TABLE statements</secondary>
+              </indexterm>
 
-            <para>
               <literal role="stmt">CREATE TABLE</literal> statements may
               be no more than 4096 characters in length. <emphasis>This
               limitation affects MySQL 5.1.6, 5.1.7, and 5.1.8

@@ -6378,12 +6378,12 @@
             <title><literal>IGNORE</literal> and <literal role="stmt">REPLACE</literal>
               functionality</title>
 
-            <indexterm>
-              <primary>MySQL Cluster limitations</primary>
-              <secondary>INSERT IGNORE, UPDATE IGNORE, and REPLACE statements</secondary>
-            </indexterm>
+            <para>
+              <indexterm>
+                <primary>MySQL Cluster limitations</primary>
+                <secondary>INSERT IGNORE, UPDATE IGNORE, and REPLACE statements</secondary>
+              </indexterm>
 
-            <para>
               In MySQL 5.1.7 and earlier,
               <literal role="stmt" condition="insert">INSERT
               IGNORE</literal>,


Modified: trunk/refman-5.1/mysql-cluster-replication-core.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-replication-core.xml	2010-10-20 02:24:35 UTC (rev 23246)
+++ trunk/refman-5.1/mysql-cluster-replication-core.xml	2010-10-20 10:14:13 UTC (rev 23247)
Changed blocks: 51, Lines Added: 281, Lines Deleted: 258; 34886 bytes

@@ -269,31 +269,33 @@
         It is possible to replicate a MySQL Cluster using
         statement-based replication. However, in this case, the
         following restrictions apply:
+      </para>
 
-        <itemizedlist>
+      <itemizedlist>
 
-          <listitem>
-            <para>
-              All updates to data rows on the cluster acting as the
-              master must be directed to a single MySQL server.
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            All updates to data rows on the cluster acting as the master
+            must be directed to a single MySQL server.
+          </para>
+        </listitem>
 
-          <listitem>
-            <para>
-              It is not possible to replicate a cluster using multiple
-              simultaneous MySQL replication processes.
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            It is not possible to replicate a cluster using multiple
+            simultaneous MySQL replication processes.
+          </para>
+        </listitem>
 
-          <listitem>
-            <para>
-              Only changes made at the SQL level are replicated.
-            </para>
-          </listitem>
+        <listitem>
+          <para>
+            Only changes made at the SQL level are replicated.
+          </para>
+        </listitem>
 
-        </itemizedlist>
+      </itemizedlist>
 
+      <para>
         These are in addition to the other limitations of
         statement-based replication as opposed to row-based replication;
         see <xref linkend="replication-sbr-rbr"/>, for more specific

@@ -326,12 +328,12 @@
 
           <title>Loss of master-slave connection</title>
 
-          <indexterm>
-            <primary>MySQL Cluster replication</primary>
-            <secondary>loss of connection</secondary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>MySQL Cluster replication</primary>
+              <secondary>loss of connection</secondary>
+            </indexterm>
 
-          <para>
             A loss of connection can occur either between the
             replication master SQL node and the replication slave SQL
             node, or between the replication master SQL node and the

@@ -367,16 +369,16 @@
           with the master.
         </para>
 
-        <indexterm>
-          <primary>MySQL Cluster replication</primary>
-          <secondary>gap event</secondary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>MySQL Cluster replication</primary>
+            <secondary>gap event</secondary>
+          </indexterm>
 
-        <indexterm>
-          <primary>gap event</primary>
-        </indexterm>
+          <indexterm>
+            <primary>gap event</primary>
+          </indexterm>
 
-        <para>
           Beginning with MySQL 5.1.18, the replication master issues a
           <quote>gap</quote> event when connecting or reconnecting to
           the master cluster. (A gap event is a type of <quote>incident

@@ -423,27 +425,27 @@
 
           <title>Multi-byte character sets</title>
 
-          <indexterm>
-            <primary>MySQL Cluster replication</primary>
-            <secondary>and multi-byte character sets</secondary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>MySQL Cluster replication</primary>
+              <secondary>and multi-byte character sets</secondary>
+            </indexterm>
 
-          <indexterm>
-            <primary>MySQL Cluster</primary>
-            <secondary>and character sets</secondary>
-          </indexterm>
+            <indexterm>
+              <primary>MySQL Cluster</primary>
+              <secondary>and character sets</secondary>
+            </indexterm>
 
-          <indexterm>
-            <primary>multi-byte character sets</primary>
-            <secondary>and MySQL Cluster (replication)</secondary>
-          </indexterm>
+            <indexterm>
+              <primary>multi-byte character sets</primary>
+              <secondary>and MySQL Cluster (replication)</secondary>
+            </indexterm>
 
-          <indexterm>
-            <primary>character sets</primary>
-            <secondary>and MySQL Cluster (replication)</secondary>
-          </indexterm>
+            <indexterm>
+              <primary>character sets</primary>
+              <secondary>and MySQL Cluster (replication)</secondary>
+            </indexterm>
 
-          <para>
             Previously, there were several known issues with regard to
             the use of multi-byte characters sets with MySQL Cluster
             Replication. These were resolved in MySQL 5.1.21, MySQL

@@ -459,22 +461,22 @@
 
           <title>Circular replication</title>
 
-          <indexterm>
-            <primary>circular replication</primary>
-            <secondary>in MySQL Cluster</secondary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>circular replication</primary>
+              <secondary>in MySQL Cluster</secondary>
+            </indexterm>
 
-          <indexterm>
-            <primary>replication</primary>
-            <secondary>circular</secondary>
-          </indexterm>
+            <indexterm>
+              <primary>replication</primary>
+              <secondary>circular</secondary>
+            </indexterm>
 
-          <indexterm>
-            <primary>MySQL Cluster replication</primary>
-            <secondary>and circular replication</secondary>
-          </indexterm>
+            <indexterm>
+              <primary>MySQL Cluster replication</primary>
+              <secondary>and circular replication</secondary>
+            </indexterm>
 
-          <para>
             Prior to MySQL 5.1.18, circular replication was not
             supported with MySQL Cluster replication, due to the fact
             that all log events created in a particular MySQL Cluster

@@ -603,12 +605,12 @@
 
           <title>MySQL Cluster replication and primary keys</title>
 
-          <indexterm>
-            <primary>MySQL Cluster replication</primary>
-            <secondary>and primary key</secondary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>MySQL Cluster replication</primary>
+              <secondary>and primary key</secondary>
+            </indexterm>
 
-          <para>
             In MySQL 5.1.6, only those <literal role="se">NDB</literal>
             tables having explicit primary keys could be replicated.
             This limitation was lifted in MySQL 5.1.7. However, in the

@@ -628,12 +630,12 @@
 
           <title>MySQL Cluster Replication and Unique Keys</title>
 
-          <indexterm>
-            <primary>MySQL Cluster replication</primary>
-            <secondary>and unique keys</secondary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>MySQL Cluster replication</primary>
+              <secondary>and unique keys</secondary>
+            </indexterm>
 
-          <para>
             Operations that update values of unique key columns of
             <literal role="se">NDB</literal> tables can result in
             duplicate-key errors when replicated. This is because row

@@ -693,12 +695,12 @@
 
           <title>Restarting with <option>--initial</option></title>
 
-          <indexterm>
-            <primary>MySQL Cluster replication</primary>
-            <secondary>and --initial option</secondary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>MySQL Cluster replication</primary>
+              <secondary>and --initial option</secondary>
+            </indexterm>
 
-          <para>
             Restarting the cluster with the <option>--initial</option>
             option causes the sequence of GCI and epoch numbers to start
             over from <literal>0</literal>. (This is generally true of

@@ -722,12 +724,12 @@
             <literal role="sysvar">auto_increment_increment</literal>
             variables</title>
 
-          <indexterm>
-            <primary>MySQL Cluster replication</primary>
-            <secondary>and auto_increment* variables</secondary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>MySQL Cluster replication</primary>
+              <secondary>and auto_increment* variables</secondary>
+            </indexterm>
 
-          <para>
             The use of the
             <literal role="sysvar">auto_increment_offset</literal> and
             <literal role="sysvar">auto_increment_increment</literal>

@@ -746,12 +748,12 @@
           <title>Replication from <literal role="se">NDBCLUSTER</literal> to other
             storage engines</title>
 
-          <indexterm>
-            <primary>MySQL Cluster replication</primary>
-            <secondary>storage engines other than NDB on slave</secondary>
-          </indexterm>
+          <para>
+            <indexterm>
+              <primary>MySQL Cluster replication</primary>
+              <secondary>storage engines other than NDB on slave</secondary>
+            </indexterm>
 
-          <para>
             If you attempt to replicate from a MySQL Cluster to a slave
             that uses a storage engine that does not handle its own
             binary logging, the replication process aborts with the

@@ -977,15 +979,15 @@
         </orderedlist>
 
         <para>
-          You should also remember that:
+          You should also remember that each replication rule requires
+          the following:
         </para>
 
         <orderedlist>
 
           <listitem>
             <para>
-              Each replication filtering rule requires its own
-              <option>--replicate-do-*</option> or
+              Its own <option>--replicate-do-*</option> or
               <option>--replicate-ignore-*</option> option, and that
               multiple rules cannot be expressed in a single replication
               filtering option. For information about these rules, see

@@ -995,8 +997,7 @@
 
           <listitem>
             <para>
-              Each binary log filtering rule requires its own
-              <option role="mysqld">--binlog-do-db</option> or
+              Its own <option role="mysqld">--binlog-do-db</option> or
               <option role="mysqld">--binlog-ignore-db</option> option,
               and that multiple rules cannot be expressed in a single
               binary log filtering option. For information about these

@@ -1197,6 +1198,7 @@
       and the epoch in which the event took place on the originating
       server. In addition, the table&apos;s primary key now includes
       these two columns. The modified table definition is shown here:
+    </para>
 
 <programlisting>
 CREATE TABLE `ndb_binlog_index` (

@@ -1214,6 +1216,7 @@
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 </programlisting>
 
+    <para>
       The <literal>gci</literal> column was added in MySQL Cluster NDB
       6.2.6 and MySQL Cluster NDB 6.3.2.
     </para>

@@ -1253,6 +1256,7 @@
       specific to any one SQL node in the (slave) cluster, and so
       <literal>ndb_apply_status</literal> can use the
       <literal>NDBCLUSTER</literal> storage engine, as shown here:
+    </para>
 
 <programlisting>
 CREATE TABLE `ndb_apply_status` (

@@ -1264,7 +1268,6 @@
     PRIMARY KEY (`server_id`) USING HASH
 ) ENGINE=NDBCLUSTER   DEFAULT CHARSET=latin1;
 </programlisting>
-    </para>
 
     <para>
       This table is populated only on slaves; on the master, no

@@ -1347,6 +1350,7 @@
       The <literal>ndb_schema</literal> table is used to track schema
       changes made to <literal role="se">NDB</literal> tables. It is
       defined as shown here:
+    </para>
 
 <programlisting>
 CREATE TABLE ndb_schema (

@@ -1362,7 +1366,6 @@
     PRIMARY KEY USING HASH (db,name)
 ) ENGINE=NDB   DEFAULT CHARSET=latin1;
 </programlisting>
-    </para>
 
     <para>
       Unlike the two tables previously mentioned in this section, the

@@ -1371,6 +1374,7 @@
       <literal>INFORMATION_SCHEMA</literal> tables; however, it can be
       seen in the output of <command>ndb_show_tables</command>, as shown
       here:
+    </para>
 
 <programlisting>
 shell&gt; <userinput>ndb_show_tables -t 2</userinput>

@@ -1385,9 +1389,11 @@
 NDBT_ProgramExit: 0 - OK
 </programlisting>
 
+    <para>
       It is also possible to <literal role="stmt">SELECT</literal> from
       this table in <command>mysql</command> and other MySQL client
       applications, as shown here:
+    </para>
 
 <programlisting>
 mysql&gt; <userinput>SELECT * FROM mysql.ndb_schema WHERE name='City' \G</userinput>

@@ -1404,6 +1410,7 @@
 1 row in set (0.00 sec)
 </programlisting>
 
+    <para>
       This can sometimes be useful when debugging applications.
     </para>
 

@@ -1513,16 +1520,16 @@
 
       <listitem>
         <para>
+          <indexterm>
+            <primary>CHANGE MASTER TO</primary>
+            <secondary>in MySQL Cluster</secondary>
+          </indexterm>
+
           Configure the slave to use the master. Using the MySQL
           Monitor, this can be accomplished with the
           <literal role="stmt">CHANGE MASTER TO</literal> statement:
         </para>
 
-        <indexterm>
-          <primary>CHANGE MASTER TO</primary>
-          <secondary>in MySQL Cluster</secondary>
-        </indexterm>
-
 <programlisting>
 mysql<replaceable>S</replaceable>&gt; <userinput>CHANGE MASTER TO</userinput>
      -&gt; <userinput>MASTER_HOST='<replaceable>master_host</replaceable>',</userinput>

@@ -1734,7 +1741,7 @@
 </programlisting>
 
         <para>
-          In the previous statement, <replaceable>id</replaceable> is
+          In the command just shown, <replaceable>id</replaceable> is
           the slave server's unique ID. It is not necessary to enable
           logging on the replication slave.
         </para>

@@ -1833,31 +1840,36 @@
       </para>
     </note>
 
+    <indexterm>
+      <primary>slave_allow_batching</primary>
+    </indexterm>
+
     <para>
       Batching can be turned on and off at runtime. To activate it at
       runtime, you can use either of these two statements:
+    </para>
 
-      <indexterm>
-        <primary>slave_allow_batching</primary>
-      </indexterm>
-
 <programlisting>
 SET GLOBAL slave_allow_batching = 1;
 SET GLOBAL slave_allow_batching = ON;
 </programlisting>
 
+    <para>
       If a particular batch causes problems (such as a statement whose
       effects do not appear to be replicated correctly), slave batching
       can be deactivated using either of the following statements:
+    </para>
 
 <programlisting>
 SET GLOBAL slave_allow_batching = 0;
 SET GLOBAL slave_allow_batching = OFF;
 </programlisting>
 
+    <para>
       You can check whether slave batching is currently being used by
       means of an appropriate <literal role="stmt">SHOW
       VARIABLES</literal> statement, like this one:
+    </para>
 
 <programlisting>
 mysql&gt; <userinput>SHOW VARIABLES LIKE 'slave%';</userinput>

@@ -1873,7 +1885,6 @@
 +---------------------------+-------+
 6 rows in set (0.00 sec)
 </programlisting>
-    </para>
 
   </section>
 

@@ -1992,24 +2003,24 @@
           Finally, initiate replication on the primary channel by
           executing the <literal role="stmt">START SLAVE</literal>
           statement on the primary slave as shown here:
+        </para>
 
 <programlisting>
 mysql<replaceable>S</replaceable>&gt; <userinput>START SLAVE;</userinput>
 </programlisting>
 
-          <warning>
-            <para>
-              Only the primary channel is to be started at this point.
-              The secondary replication channel is to be started only in
-              the event that the primary replication channel fails, as
-              described in
-              <xref linkend="mysql-cluster-replication-failover"/>.
-              Running multiple replication channels simultaneously can
-              result in unwanted duplicate records being created on the
-              replication slaves.
-            </para>
-          </warning>
-        </para>
+        <warning>
+          <para>
+            Only the primary channel is to be started at this point. The
+            secondary replication channel is to be started only in the
+            event that the primary replication channel fails, as
+            described in
+            <xref linkend="mysql-cluster-replication-failover"/>.
+            Running multiple replication channels simultaneously can
+            result in unwanted duplicate records being created on the
+            replication slaves.
+          </para>
+        </warning>
       </listitem>
 
     </orderedlist>

@@ -2063,11 +2074,11 @@
       </listitem>
 
       <listitem>
-        <indexterm>
-          <primary>ndb_binlog_index table (MySQL Cluster replication)</primary>
-        </indexterm>
+        <para>
+          <indexterm>
+            <primary>ndb_binlog_index table (MySQL Cluster replication)</primary>
+          </indexterm>
 
-        <para>
           Using the information obtained from the query shown in Step 1,
           obtain the corresponding records from the
           <literal>ndb_binlog_index</literal> table on the master

@@ -2230,35 +2241,37 @@
                 <literal role="se">NDB</literal> management server for
                 the master cluster, and <replaceable>port</replaceable>
                 is the management server's port number:
+              </para>
 
+            </formalpara>
+
 <programlisting>
 ndb-connectstring=<replaceable>management_host</replaceable>[:<replaceable>port</replaceable>]
 </programlisting>
 
-                <note>
-                  <para>
-                    The port number needs to be specified only if the
-                    default port (1186) is not being used. See
-                    <xref linkend="mysql-cluster-multi-config"/>, for
-                    more information about ports and port allocation in
-                    MySQL Cluster.
-                  </para>
-                </note>
+            <note>
+              <para>
+                The port number needs to be specified only if the
+                default port (1186) is not being used. See
+                <xref linkend="mysql-cluster-multi-config"/>, for more
+                information about ports and port allocation in MySQL
+                Cluster.
+              </para>
+            </note>
 
-                <indexterm>
-                  <primary>MySQL Cluster</primary>
-                  <secondary>START BACKUP command</secondary>
-                </indexterm>
+            <para>
+              <indexterm>
+                <primary>MySQL Cluster</primary>
+                <secondary>START BACKUP command</secondary>
+              </indexterm>
 
-                In this case, the backup can be started by executing
-                this statement on the replication master:
+              In this case, the backup can be started by executing this
+              statement on the replication master:
+            </para>
 
 <programlisting>
 shell<replaceable>M</replaceable>&gt; <userinput>ndb_mgm -e "START BACKUP"</userinput>
 </programlisting>
-              </para>
-
-            </formalpara>
           </listitem>
 
           <listitem>

@@ -2276,21 +2289,23 @@
                 <replaceable>management_host</replaceable> and
                 <replaceable>port</replaceable> are the host name and
                 port number of the management server:
+              </para>
 
+            </formalpara>
+
 <programlisting>
 shell<replaceable>M</replaceable>&gt; <userinput>ndb_mgm <replaceable>management_host</replaceable>:<replaceable>port</replaceable> -e "START BACKUP"</userinput>
 </programlisting>
 
-                In our scenario as outlined earlier (see
-                <xref linkend="mysql-cluster-replication-preparation"/>),
-                this would be executed as follows:
+            <para>
+              In our scenario as outlined earlier (see
+              <xref linkend="mysql-cluster-replication-preparation"/>),
+              this would be executed as follows:
+            </para>
 
 <programlisting>
 shell<replaceable>M</replaceable>&gt; <userinput>ndb_mgm rep-master:1186 -e "START BACKUP"</userinput>
 </programlisting>
-              </para>
-
-            </formalpara>
           </listitem>
 
         </itemizedlist>

@@ -2441,6 +2456,7 @@
           file <literal>@file</literal> from the master's
           <literal>mysql.ndb_binlog_index</literal> table using the
           query shown here:
+        </para>
 
 <programlisting>
 mysql<replaceable>M</replaceable>&gt; <userinput>SELECT</userinput>

@@ -2450,7 +2466,6 @@
      -&gt; <userinput>WHERE epoch &gt; @latest</userinput>
      -&gt; <userinput>ORDER BY epoch ASC LIMIT 1;</userinput>
 </programlisting>
-        </para>
 
         <para>
           In the event that there is currently no replication traffic,

@@ -2957,39 +2972,44 @@
     </formalpara>
 
     <para>
-      Circular replication using these clusters is supported as long as:
+      Circular replication using these clusters is supported as long as
+      the following conditions are met:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            The SQL nodes on all masters and slaves are the same
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          The SQL nodes on all masters and slaves are the same
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            All SQL nodes acting as replication masters and slaves are
-            started using the <option>&ddash;log-slave-updates</option>
-            option
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          All SQL nodes acting as replication masters and slaves are
+          started using the <option>&ddash;log-slave-updates</option>
+          option
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
+    <para>
       This type of circular replication setup is shown in the following
       diagram:
+    </para>
 
-      <mediaobject>
-        <imageobject>
-          <imagedata contentwidth="550" contentdepth="646" fileref="../refman-common/images/published/cluster-circular-replication-1.png" format="PNG"/>
-        </imageobject>
-        <textobject>
-          <phrase lang="en">MySQL Cluster circular replication scheme in
-          which all master SQL nodes are also slaves.</phrase>
-        </textobject>
-      </mediaobject>
+    <mediaobject>
+      <imageobject>
+        <imagedata contentwidth="550" contentdepth="646" fileref="../refman-common/images/published/cluster-circular-replication-1.png" format="PNG"/>
+      </imageobject>
+      <textobject>
+        <phrase lang="en">MySQL Cluster circular replication scheme in
+        which all master SQL nodes are also slaves.</phrase>
+      </textobject>
+    </mediaobject>
 
+    <para>
       In this scenario, SQL node A in Cluster 1 replicates to SQL node C
       in Cluster 2; SQL node C replicates to SQL node E in Cluster 3;
       SQL node E replicates to SQL node A. In other words, the

@@ -3001,18 +3021,20 @@
     <para>
       It is also possible to set up circular replication in such a way
       that not all master SQL nodes are also slaves, as shown here:
+    </para>
 
-      <mediaobject>
-        <imageobject>
-          <imagedata contentwidth="550" contentdepth="622" fileref="../refman-common/images/published/cluster-circular-replication-2.png" format="PNG"/>
-        </imageobject>
-        <textobject>
-          <phrase lang="en">MySQL Cluster circular replication scheme in
-          which all master SQL nodes are not also necessarily
-          slaves.</phrase>
-        </textobject>
-      </mediaobject>
+    <mediaobject>
+      <imageobject>
+        <imagedata contentwidth="550" contentdepth="622" fileref="../refman-common/images/published/cluster-circular-replication-2.png" format="PNG"/>
+      </imageobject>
+      <textobject>
+        <phrase lang="en">MySQL Cluster circular replication scheme in
+        which all master SQL nodes are not also necessarily
+        slaves.</phrase>
+      </textobject>
+    </mediaobject>
 
+    <para>
       In this case, different SQL nodes in each cluster are used as
       replication masters and slaves. However, you must
       <emphasis>not</emphasis> start any of the SQL nodes using

@@ -3030,11 +3052,13 @@
       <para>
         Beginning with MySQL 5.1.24, you should execute the following
         statement before starting circular replication:
+      </para>
 
 <programlisting>
 mysql&gt; <userinput>SET GLOBAL SLAVE_EXEC_MODE = 'IDEMPOTENT';</userinput>
 </programlisting>
 
+      <para>
         This is necessary to suppress duplicate-key and other errors
         that otherwise break circular replication in MySQL Cluster.
         <literal>IDEMPOTENT</literal> mode is also required for

@@ -3047,16 +3071,16 @@
       </para>
     </important>
 
-    <indexterm>
-      <primary>ndb_restore</primary>
-      <secondary>and circular replication</secondary>
-    </indexterm>
-
     <formalpara>
 
       <title>Using NDB-native backup and restore to initialize a slave MySQL Cluster</title>
 
       <para>
+        <indexterm>
+          <primary>ndb_restore</primary>
+          <secondary>and circular replication</secondary>
+        </indexterm>
+
         When setting up circular replication, it is possible to
         initialize the slave cluster by using the management client
         <literal>BACKUP</literal> command on one MySQL Cluster to create

@@ -3087,39 +3111,43 @@
         server IDs 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>
-            <imagedata contentwidth="350" contentdepth="275" fileref="../refman-common/images/published/cluster-replication-multi-master.png" format="PNG"/>
-          </imageobject>
-          <textobject>
-            <phrase lang="EN">Multi-master MySQL Cluster replication
-            setup, with three MySQL Clusters</phrase>
-          </textobject>
-        </mediaobject>
-
-        In other words, data replicates from Cluster 1 to Cluster 3
-        through 2 different routes: directly, and by way of Cluster 2.
       </para>
 
     </formalpara>
 
+    <mediaobject>
+      <imageobject>
+        <imagedata contentwidth="350" contentdepth="275" fileref="../refman-common/images/published/cluster-replication-multi-master.png" format="PNG"/>
+      </imageobject>
+      <textobject>
+        <phrase lang="EN">Multi-master MySQL Cluster replication setup,
+        with three MySQL Clusters</phrase>
+      </textobject>
+    </mediaobject>
+
     <para>
+      In other words, data replicates from Cluster 1 to Cluster 3
+      through 2 different routes: directly, and by way of Cluster 2.
+    </para>
+
+    <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. Such a
       case is shown here:
+    </para>
 
-      <mediaobject>
-        <imageobject>
-          <imagedata contentwidth="500" contentdepth="375" 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>
+    <mediaobject>
+      <imageobject>
+        <imagedata contentwidth="500" contentdepth="375" 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>
 
+    <para>
       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

@@ -3148,6 +3176,7 @@
 
     <para>
       On server C, perform the following queries:
+    </para>
 
 <programlisting>
 mysqlC&gt; SELECT @latest:=MAX(epoch)

@@ -3162,7 +3191,6 @@
      -&gt;     AND orig_server_id = 1
      -&gt;     ORDER BY epoch ASC LIMIT 1;
 </programlisting>
-    </para>
 
     <para>
       Copy over the values for <replaceable>@file</replaceable> and

@@ -3170,6 +3198,7 @@
       (or have your application perform the equivalent). Then, on server
       F, execute the following <literal role="stmt">CHANGE MASTER
       TO</literal> statement:
+    </para>
 
 <programlisting>
 mysqlF&gt; CHANGE MASTER TO

@@ -3177,7 +3206,6 @@
      -&gt;     MASTER_LOG_FILE='@file',
      -&gt;     MASTER_LOG_POS=@pos;
 </programlisting>
-    </para>
 
     <para>
       Once this has been done, you can issue a

@@ -3257,7 +3285,8 @@
 
       <para>
         Preparations for conflict resolution must be made on both the
-        master and the slave:
+        master and the slave. These tasks are described in the following
+        list:
       </para>
 
     </formalpara>

@@ -3360,10 +3389,9 @@
       <secondary>mysqld startup options</secondary>
     </indexterm>
 
-    <para>
-      <emphasis role="bold">Logging full or partial rows
-      (<option>--ndb-log-updated-only</option> option)</emphasis>
-    </para>
+    <bridgehead>
+      Logging Full or Partial Rows (<option>--ndb-log-updated-only</option> Option)
+    </bridgehead>
 
     <para condition="dynamic:optvar:item" role="5.1:mysqld:ndb_log_updated_only"/>
 

@@ -3400,10 +3428,9 @@
       <literal>0</literal> or <literal>OFF</literal>.
     </para>
 
-    <para>
-      <emphasis role="bold"><option role="mysqld">--ndb-log-update-as-write</option>
-      option: logging changed data as updates</emphasis>
-    </para>
+    <bridgehead>
+      <option role="mysqld">--ndb-log-update-as-write</option> Option: Logging Changed Data as Updates
+    </bridgehead>
 
     <para condition="dynamic:optvar:item" role="5.1:mysqld:ndb-log-update-as-write"/>
 

@@ -3448,16 +3475,16 @@
 
       <title>The <literal>ndb_replication</literal> system table</title>
 
-      <indexterm>
-        <primary>ndb_replication system table</primary>
-      </indexterm>
+      <para>
+        <indexterm>
+          <primary>ndb_replication system table</primary>
+        </indexterm>
 
-      <indexterm>
-        <primary>conflict resolution</primary>
-        <secondary>and ndb_replication system table</secondary>
-      </indexterm>
+        <indexterm>
+          <primary>conflict resolution</primary>
+          <secondary>and ndb_replication system table</secondary>
+        </indexterm>
 
-      <para>
         To enable conflict resolution, it is necessary to create an
         <literal>ndb_replication</literal> table in the
         <literal>mysql</literal> system database on the master, the

@@ -3629,11 +3656,11 @@
 
               <title><literal>NDB$OLD(<replaceable>column_name</replaceable></literal>)</title>
 
-              <indexterm>
-                <primary>NDB$OLD</primary>
-              </indexterm>
+              <para>
+                <indexterm>
+                  <primary>NDB$OLD</primary>
+                </indexterm>
 
-              <para>
                 If the value of <replaceable>column_name</replaceable>
                 is the same on both the master and the slave, then the
                 update is applied; otherwise, the update is not applied

@@ -3650,11 +3677,11 @@
   log_exception();
 </programlisting>
 
-            <indexterm>
-              <primary>same value wins (conflict resolution)</primary>
-            </indexterm>
+            <para>
+              <indexterm>
+                <primary>same value wins (conflict resolution)</primary>
+              </indexterm>
 
-            <para>
               This function can be used for <quote>same value
               wins</quote> conflict resolution. This type of conflict
               resolution ensures that updates are not applied on the

@@ -3679,11 +3706,11 @@
 
               <title><literal>NDB$MAX(<replaceable>column_name</replaceable></literal>)</title>
 
-              <indexterm>
-                <primary>NDB$MAX()</primary>
-              </indexterm>
+              <para>
+                <indexterm>
+                  <primary>NDB$MAX()</primary>
+                </indexterm>
 
-              <para>
                 If the <quote>timestamp</quote> column value for a given
                 row coming from the master is higher than that on the
                 slave, it is applied; otherwise it is not applied on the

@@ -3697,11 +3724,11 @@
   perform_update();
 </programlisting>
 
-            <indexterm>
-              <primary>greatest timestamp wins (conflict resolution)</primary>
-            </indexterm>
+            <para>
+              <indexterm>
+                <primary>greatest timestamp wins (conflict resolution)</primary>
+              </indexterm>
 
-            <para>
               This function can be used for <quote>greatest timestamp
               wins</quote> conflict resolution. This type of conflict
               resolution ensures that, in the event of a conflict, the

@@ -3727,11 +3754,11 @@
 
               <title><literal>NDB$MAX_DELETE_WIN(<replaceable>column_name</replaceable></literal>)</title>
 
-              <indexterm>
-                <primary>NDB$MAX_DELETE_WIN()</primary>
-              </indexterm>
+              <para>
+                <indexterm>
+                  <primary>NDB$MAX_DELETE_WIN()</primary>
+                </indexterm>
 
-              <para>
                 This is a variation on <literal>NDB$MAX()</literal>. Due
                 to the fact that no timestamp is available for a delete
                 operation, a delete using <literal>NDB$MAX()</literal>

@@ -3755,11 +3782,11 @@
   perform_update();
 </programlisting>
 
-            <indexterm>
-              <primary>greatest timestamp, delete wins (conflict resolution)</primary>
-            </indexterm>
+            <para>
+              <indexterm>
+                <primary>greatest timestamp, delete wins (conflict resolution)</primary>
+              </indexterm>
 
-            <para>
               This function can be used for <quote>greatest timestamp,
               delete wins</quote> conflict resolution. This type of
               conflict resolution ensures that, in the event of a

@@ -3912,16 +3939,12 @@
       </para>
     </important>
 
-    <remark>
+    <remark role="note">
       test rpl_ndb_rep_error.test - negative testing of the
-      mysql.ndb_replication table
+      mysql.ndb_replication table; test rpl_ndb_conflict.test - test the
+      basic "highest wins" conflict resolution schema
     </remark>
 
-    <remark>
-      test rpl_ndb_conflict.test - test the basic "highest wins"
-      conflict resolution schema
-    </remark>
-
     <formalpara>
 
       <title>Examples</title>


Modified: trunk/refman-5.1/mysql-cluster.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster.xml	2010-10-20 02:24:35 UTC (rev 23246)
+++ trunk/refman-5.1/mysql-cluster.xml	2010-10-20 10:14:13 UTC (rev 23247)
Changed blocks: 3, Lines Added: 6, Lines Deleted: 6; 1440 bytes

@@ -350,7 +350,7 @@
     This chapter represents a work in progress, and its contents are
     subject to revision as MySQL Cluster continues to evolve. Additional
     information regarding MySQL Cluster can be found on the MySQL Web
-    site at http://www.mysql.com/products/cluster/.
+    site at <uri>http://www.mysql.com/products/cluster/</uri>.
   </para>
 
   <indexterm>

@@ -372,8 +372,8 @@
 
     <listitem>
       <para>
-        Answers to some commonly asked questions about Cluster may be
-        found in the <xref linkend="faqs-mysql-cluster"/>.
+        For answers to some commonly asked questions about MySQL
+        Cluster, see <xref linkend="faqs-mysql-cluster"/>.
       </para>
     </listitem>
 

@@ -393,9 +393,9 @@
 
     <listitem>
       <para>
-        Many MySQL Cluster users and some of the MySQL Cluster
-        developers blog about their experiences with Cluster, and make
-        feeds of these available through
+        Many MySQL Cluster users and developers blog about their
+        experiences with MySQL Cluster, and make feeds of these
+        available through
         <ulink url="http://www.planetmysql.org/">PlanetMySQL</ulink>.
       </para>
     </listitem>


Thread
svn commit - mysqldoc@docsrva: r23247 - trunk/refman-5.1jon.stephens20 Oct