MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:jon.stephens Date:September 20 2010 5:17pm
Subject:svn commit - mysqldoc@docsrva: r22782 - trunk/refman-5.1
View as plain text  
Author: jstephens
Date: 2010-09-20 19:17:16 +0200 (Mon, 20 Sep 2010)
New Revision: 22782

Log:

Added links and target (BUG#54115)

Fixed invalid formalpara



Modified:
   trunk/refman-5.1/mysql-cluster-replication-core.xml


Modified: trunk/refman-5.1/mysql-cluster-replication-core.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-replication-core.xml	2010-09-20 16:36:14 UTC (rev 22781)
+++ trunk/refman-5.1/mysql-cluster-replication-core.xml	2010-09-20 17:17:16 UTC (rev 22782)
Changed blocks: 7, Lines Added: 56, Lines Deleted: 53; 6456 bytes

@@ -3269,9 +3269,10 @@
           columns are sent (all columns or only those that have been
           updated). This is done for the MySQL Server as a whole by
           applying the <command>mysqld</command> startup option
-          <option>-–ndb-log-updated-only</option> (described later in
-          this section) or on a per-table basis by entries in the
-          <literal>mysql.ndb_replication</literal> table.
+          <option role="mysqld">-–ndb-log-updated-only</option>
+          (described later in this section) or on a per-table basis by
+          entries in the <literal>mysql.ndb_replication</literal> table
+          (see <xref linkend="mysql-cluster-ndb-replication-table"/>).
         </para>
 
         <note>

@@ -3299,7 +3300,8 @@
           resolution to apply (<quote>latest timestamp wins</quote>,
           <quote>same timestamp wins</quote>, or none). This is done
           using the <literal>mysql.ndb_replication</literal> system
-          table, on a per-table basis.
+          table, on a per-table basis (see
+          <xref linkend="mysql-cluster-ndb-replication-table"/>).
         </para>
       </listitem>
 

@@ -3445,7 +3447,7 @@
 
     </formalpara>
 
-    <formalpara>
+    <formalpara id="mysql-cluster-ndb-replication-table">
 
       <title>The <literal>ndb_replication</literal> system table</title>
 

@@ -4006,9 +4008,9 @@
 
             <para>
               Now, when updates are done on this table, conflict
-              resolution will be applied, and the version of the row
-              having the greatest value for <literal>mycol</literal>
-              will be written to the slave.
+              resolution is applied, and the version of the row having
+              the greatest value for <literal>mycol</literal> is written
+              to the slave.
             </para>
           </listitem>
 

@@ -4037,6 +4039,8 @@
             resolution for updates to this table:
           </para>
 
+        </formalpara>
+
 <programlisting>
 CREATE TABLE test.t2  (
     a INT UNSIGNED NOT NULL,

@@ -4048,41 +4052,42 @@
 )   ENGINE=NDB;
 </programlisting>
 
-          <para>
-            The following steps are required, in the order shown:
-          </para>
+        <para>
+          The following steps are required, in the order shown:
+        </para>
 
-          <orderedlist>
+        <orderedlist>
 
-            <listitem>
-              <para>
-                First&mdash;and <emphasis>prior</emphasis> to creating
-                <literal>test.t2</literal>&mdash;you must insert a row
-                into the <literal>mysql.ndb_replication</literal> table,
-                as shown here:
-              </para>
+          <listitem>
+            <para>
+              First&mdash;and <emphasis>prior</emphasis> to creating
+              <literal>test.t2</literal>&mdash;you must insert a row
+              into the
+              <link linkend="mysql-cluster-ndb-replication-table"><literal>mysql.ndb_replication</literal></link>
+              table, as shown here:
+            </para>
 
 <programlisting>
 INSERT INTO mysql.ndb_replication
     VALUES ('test', 't2', 0, NULL, 'NDB$OLD(mycol)');
 </programlisting>
 
-              <para>
-                Possible values for the <literal>binlog_type</literal>
-                column are shown earlier in this section. The value
-                <literal>'NDB$OLD(mycol)'</literal> should be inserted
-                into the <literal>conflict_fn</literal> column.
-              </para>
-            </listitem>
+            <para>
+              Possible values for the <literal>binlog_type</literal>
+              column are shown earlier in this section. The value
+              <literal>'NDB$OLD(mycol)'</literal> should be inserted
+              into the <literal>conflict_fn</literal> column.
+            </para>
+          </listitem>
 
-            <listitem>
-              <para>
-                Create an appropriate exceptions table for
-                <literal>test.t2</literal>. The table creation statement
-                shown here includes all required columns; any additional
-                columns must be declared following these columns, and
-                before the definition of the table's primary key.
-              </para>
+          <listitem>
+            <para>
+              Create an appropriate exceptions table for
+              <literal>test.t2</literal>. The table creation statement
+              shown here includes all required columns; any additional
+              columns must be declared following these columns, and
+              before the definition of the table's primary key.
+            </para>
 
 <programlisting>
 CREATE TABLE test.t2$EX  (

@@ -4096,28 +4101,26 @@
     PRIMARY KEY(server_id, master_server_id, master_epoch, count)
 )   ENGINE=NDB;
 </programlisting>
-            </listitem>
+          </listitem>
 
-            <listitem>
-              <para>
-                Create the table <literal>test.t2</literal> as shown
-                previously.
-              </para>
-            </listitem>
+          <listitem>
+            <para>
+              Create the table <literal>test.t2</literal> as shown
+              previously.
+            </para>
+          </listitem>
 
-          </orderedlist>
+        </orderedlist>
 
-          <para>
-            These steps must be followed for every table for which you
-            wish to perform conflict resolution using
-            <literal>NDB$OLD()</literal>. For each such table, there
-            must be a corresponding row in
-            <literal>mysql.ndb_replication</literal>, and there must be
-            an exceptions table in the same database as the table being
-            replicated.
-          </para>
-
-        </formalpara>
+        <para>
+          These steps must be followed for every table for which you
+          wish to perform conflict resolution using
+          <literal>NDB$OLD()</literal>. For each such table, there must
+          be a corresponding row in
+          <literal>mysql.ndb_replication</literal>, and there must be an
+          exceptions table in the same database as the table being
+          replicated.
+        </para>
       </listitem>
 
     </itemizedlist>


Thread
svn commit - mysqldoc@docsrva: r22782 - trunk/refman-5.1jon.stephens20 Sep