List:Commits« Previous MessageNext Message »
From:jon.stephens Date:March 1 2011 4:38pm
Subject:svn commit - mysqldoc@oter02: r25196 - trunk/refman-5.1
View as plain text  
Author: js221926
Date: 2011-03-01 17:38:20 +0100 (Tue, 01 Mar 2011)
New Revision: 25196

Log:

Give Ndb_conflict_fn_max and Ndb_conflict_fn_max proper link targets in "MySQL 
Cluster Status Variables", point reader to Conflict Resolution material from 
there (Mai)



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


Modified: trunk/refman-5.1/mysql-cluster-configuration-core.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-configuration-core.xml	2011-03-01 16:36:02 UTC (rev 25195)
+++ trunk/refman-5.1/mysql-cluster-configuration-core.xml	2011-03-01 16:38:20 UTC (rev 25196)
Changed blocks: 1, Lines Added: 40, Lines Deleted: 0; 2000 bytes

@@ -11343,6 +11343,46 @@
         </listitem>
 
         <listitem>
+          <para id="statvar_Ndb_conflict_fn_max">
+            <literal>Ndb_conflict_fn_max</literal>
+          </para>
+
+          <para>
+            Used in MySQL Cluster Replication conflict resolution, this
+            variable shows the number of times that a row was not
+            applied on the current SQL node due to <quote>greatest
+            timestamp wins</quote> conflict resolution since the last
+            time that this <command>mysqld</command> was started.
+          </para>
+
+          <para>
+            This variable was added in MySQL Cluster NDB 6.3.3. For more
+            information, see
+            <xref linkend="mysql-cluster-replication-conflict-resolution"/>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para id="statvar_Ndb_conflict_fn_old">
+            <literal>Ndb_conflict_fn_old</literal>
+          </para>
+
+          <para>
+            Used in MySQL Cluster Replication conflict resolution, this
+            variable shows the number of times that a row was not
+            applied as the result of <quote>same timestamp wins</quote>
+            conflict resolution on a given <command>mysqld</command>
+            since the last time it was restarted.
+          </para>
+
+          <para>
+            This variable was added in MySQL Cluster NDB 6.3.4. For more
+            information, see
+            <xref linkend="mysql-cluster-replication-conflict-resolution"/>.
+          </para>
+        </listitem>
+
+        <listitem>
           <para id="statvar_Ndb_execute_count">
             <literal role="statvar">Ndb_execute_count</literal>
           </para>


Modified: trunk/refman-5.1/mysql-cluster-replication-core.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-replication-core.xml	2011-03-01 16:36:02 UTC (rev 25195)
+++ trunk/refman-5.1/mysql-cluster-replication-core.xml	2011-03-01 16:38:20 UTC (rev 25196)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 933 bytes

@@ -3836,7 +3836,7 @@
 
       <title>Status information</title>
 
-      <para id="statvar_Ndb_conflict_fn_max">
+      <para>
         Beginning with MySQL Cluster NDB 6.3.3, a server status variable
         <literal role="statvar">Ndb_conflict_fn_max</literal> provides a
         count of the number of times that a row was not applied on the

@@ -3847,7 +3847,7 @@
 
     </formalpara>
 
-    <para id="statvar_Ndb_conflict_fn_old">
+    <para>
       Beginning with MySQL Cluster NDB 6.3.4, the number of times that a
       row was not applied as the result of <quote>same timestamp
       wins</quote> conflict resolution on a given


Thread
svn commit - mysqldoc@oter02: r25196 - trunk/refman-5.1jon.stephens1 Mar