svn commit - mysqldoc@docsrva: r22794 - trunk/refman-5.1

[jon.stephens]

Author: jstephens
Date: 2010-09-21 11:11:22 +0200 (Tue, 21 Sep 2010)
New Revision: 22794

Log:

Rest of fix for Doc BUG#54115 (Conflict resolution)



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-21 01:31:37 UTC (rev 22793)
+++ trunk/refman-5.1/mysql-cluster-replication-core.xml	2010-09-21 09:11:22 UTC (rev 22794)
Changed blocks: 2, Lines Added: 19, Lines Deleted: 16; 3202 bytes

@@ -875,7 +875,8 @@
             unnecessary duplicate key errors when replicating
             <literal role="stmt" condition="insert-on-duplicate">INSERT
             ... ON DUPLICATE KEY UPDATE</literal> statements. You can
-            suppress these in MySQL Cluster NDB 6.2 by using
+            suppress these in MySQL Cluster NDB 6.2 and later MySQL
+            Cluster releases by using
             <option role="mysqld">--ndb-log-update-as-write=0</option>,
             which forces updates to be logged as writes (rather than as
             updates).

@@ -3400,26 +3401,28 @@
     </para>
 
     <para>
-      <emphasis role="bold">Logging changed data as updates
-      (<option role="mysqld">--ndb-log-update-as-write</option>
-      option)</emphasis>
+      <emphasis role="bold"><option role="mysqld">--ndb-log-update-as-write</option>
+      option: logging changed data as updates</emphasis>
     </para>
 
     <para condition="dynamic:optvar:item" role="5.1:mysqld:ndb-log-update-as-write"/>
 
     <para id="option_mysqld_ndb-log-update-as-write">
-      Either of these logging methods can be configured to be done with
-      or without the <quote>before</quote> image as determined by the
-      setting of another MySQL Server option
-      <option role="mysqld">--ndb-log-update-as-write</option>. Because
-      conflict resolution is done in the MySQL Server's update handler,
-      it is necessary to control logging on the master such that updates
-      are updates and not writes; that is, such that updates are treated
-      as changes in existing rows rather than the writing of new rows
-      (even though these replace existing rows). This option is turned
-      on by default; in other words, updates are treated as writes. To
-      turn off the option, start the master <command>mysqld</command>
-      with <option>--ndb-log-update-as-write=0</option> or
+      The setting of the MySQL Server&apos;s
+      <option role="mysqld">--ndb-log-update-as-write</option> option
+      determines whether logging is performed with or without the
+      <quote>before</quote> image. Because conflict resolution is done
+      in the MySQL Server&apos;s update handler, it is necessary to
+      control logging on the master such that updates are updates and
+      not writes; that is, such that updates are treated as changes in
+      existing rows rather than the writing of new rows (even though
+      these replace existing rows). This option is turned on by default;
+      in other words, updates are treated as writes. (That is, updates
+      are by default written as <literal>write_row</literal> events in
+      the binary log, rather than as <literal>update_row</literal>
+      events.) To turn off the option, start the master
+      <command>mysqld</command> with
+      <option>--ndb-log-update-as-write=0</option> or
       <option>--ndb-log-update-as-write=OFF</option>.
     </para>