Author: jstephens
Date: 2008-02-15 14:43:12 +0100 (Fri, 15 Feb 2008)
New Revision: 9849
Log:
Some wording and other fixes for the Conflict Resolution section, as
suggested by MMontgomery
Modified:
trunk/pt/refman-5.1/mysql-cluster-replication.xml
trunk/refman-5.1/mysql-cluster-replication.xml
trunk/refman-6.0/mysql-cluster-replication.xml
Modified: trunk/pt/refman-5.1/mysql-cluster-replication.xml
===================================================================
--- trunk/pt/refman-5.1/mysql-cluster-replication.xml 2008-02-15 13:11:51 UTC (rev 9848)
+++ trunk/pt/refman-5.1/mysql-cluster-replication.xml 2008-02-15 13:43:12 UTC (rev 9849)
Changed blocks: 4, Lines Added: 9, Lines Deleted: 7; 3016 bytes
@@ -2255,7 +2255,7 @@
On the master writing the binlogs, you must determine
which columns are sent (all columns or only those that
have been updated). This is done for the MySQL Server as a
- while by applying the <command>mysqld</command> startup
+ 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>
@@ -2360,8 +2360,8 @@
</itemizedlist>
- It more efficient to log updated columns only; however, if you
- need to log full rows, you can do so by setting
+ It is more efficient to log updated columns only; however, if
+ you need to log full rows, you can do so by setting
<option>--ndb-log-updated-only</option> to <literal>0</literal>
or <literal>OFF</literal>.
</para>
@@ -2380,8 +2380,10 @@
<option>--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. This option is turned on by default; to
- turn it off, start the server with
+ 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; to turn it off, start the server with
<option>--ndb-log-update-as-write=0</option> or
<option>--ndb-log-update-as-write=OFF</option>.
</para>
@@ -2540,14 +2542,14 @@
</row>
<row>
<entry>6</entry>
- <entry><literal>NBT_UPDATED_ONLY_USE_UPDATE</literal> (=
+ <entry><literal>NBT_UPDATED_ONLY_USE_UPDATE</literal> (equal to
<literal>NBT_UPDATED_ONLY |
NBT_USE_UPDATE</literal>)</entry>
<entry>Use updated attributes, even if values are unchanged</entry>
</row>
<row>
<entry>7</entry>
- <entry><literal>NBT_FULL_USE_UPDATE</literal>(= <literal>NBT_FULL |
+ <entry><literal>NBT_FULL_USE_UPDATE</literal> (equal to <literal>NBT_FULL |
NBT_USE_UPDATE</literal>)</entry>
<entry>Use full row, even if values are unchanged</entry>
</row>
Modified: trunk/refman-5.1/mysql-cluster-replication.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-replication.xml 2008-02-15 13:11:51 UTC (rev 9848)
+++ trunk/refman-5.1/mysql-cluster-replication.xml 2008-02-15 13:43:12 UTC (rev 9849)
Changed blocks: 4, Lines Added: 9, Lines Deleted: 7; 3007 bytes
@@ -2314,7 +2314,7 @@
On the master writing the binlogs, you must determine
which columns are sent (all columns or only those that
have been updated). This is done for the MySQL Server as a
- while by applying the <command>mysqld</command> startup
+ 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>
@@ -2419,8 +2419,8 @@
</itemizedlist>
- It more efficient to log updated columns only; however, if you
- need to log full rows, you can do so by setting
+ It is more efficient to log updated columns only; however, if
+ you need to log full rows, you can do so by setting
<option>--ndb-log-updated-only</option> to <literal>0</literal>
or <literal>OFF</literal>.
</para>
@@ -2439,8 +2439,10 @@
<option>--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. This option is turned on by default; to
- turn it off, start the server with
+ 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; to turn it off, start the server with
<option>--ndb-log-update-as-write=0</option> or
<option>--ndb-log-update-as-write=OFF</option>.
</para>
@@ -2599,14 +2601,14 @@
</row>
<row>
<entry>6</entry>
- <entry><literal>NBT_UPDATED_ONLY_USE_UPDATE</literal> (=
+ <entry><literal>NBT_UPDATED_ONLY_USE_UPDATE</literal> (equal to
<literal>NBT_UPDATED_ONLY |
NBT_USE_UPDATE</literal>)</entry>
<entry>Use updated attributes, even if values are unchanged</entry>
</row>
<row>
<entry>7</entry>
- <entry><literal>NBT_FULL_USE_UPDATE</literal>(= <literal>NBT_FULL |
+ <entry><literal>NBT_FULL_USE_UPDATE</literal> (equal to <literal>NBT_FULL |
NBT_USE_UPDATE</literal>)</entry>
<entry>Use full row, even if values are unchanged</entry>
</row>
Modified: trunk/refman-6.0/mysql-cluster-replication.xml
===================================================================
--- trunk/refman-6.0/mysql-cluster-replication.xml 2008-02-15 13:11:51 UTC (rev 9848)
+++ trunk/refman-6.0/mysql-cluster-replication.xml 2008-02-15 13:43:12 UTC (rev 9849)
Changed blocks: 6, Lines Added: 11, Lines Deleted: 9; 3872 bytes
@@ -407,7 +407,7 @@
<para>
All SQL nodes acting as replication masters and slaves
are started using the
- <option>&ddash;log-slave-updates</option> option
+ <option>--log-slave-updates</option> option
</para>
</listitem>
@@ -452,7 +452,7 @@
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
- <option>&ddash;log-slave-updates</option> (see the
+ <option>--log-slave-updates</option> (see the
<link linkend="option_mysqld_log-slave-updates">description of
this option</link> for more information). This type of
circular replication scheme for MySQL Cluster, in which the
@@ -2237,7 +2237,7 @@
On the master writing the binlogs, you must determine
which columns are sent (all columns or only those that
have been updated). This is done for the MySQL Server as a
- while by applying the <command>mysqld</command> startup
+ 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>
@@ -2342,8 +2342,8 @@
</itemizedlist>
- It more efficient to log updated columns only; however, if you
- need to log full rows, you can do so by setting
+ It is more efficient to log updated columns only; however, if
+ you need to log full rows, you can do so by setting
<option>--ndb-log-updated-only</option> to <literal>0</literal>
or <literal>OFF</literal>.
</para>
@@ -2362,8 +2362,10 @@
<option>--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. This option is turned on by default; to
- turn it off, start the server with
+ 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; to turn it off, start the server with
<option>--ndb-log-update-as-write=0</option> or
<option>--ndb-log-update-as-write=OFF</option>.
</para>
@@ -2522,14 +2524,14 @@
</row>
<row>
<entry>6</entry>
- <entry><literal>NBT_UPDATED_ONLY_USE_UPDATE</literal> (=
+ <entry><literal>NBT_UPDATED_ONLY_USE_UPDATE</literal> (equal to
<literal>NBT_UPDATED_ONLY |
NBT_USE_UPDATE</literal>)</entry>
<entry>Use updated attributes, even if values are unchanged</entry>
</row>
<row>
<entry>7</entry>
- <entry><literal>NBT_FULL_USE_UPDATE</literal>(= <literal>NBT_FULL |
+ <entry><literal>NBT_FULL_USE_UPDATE</literal> (equal to <literal>NBT_FULL |
NBT_USE_UPDATE</literal>)</entry>
<entry>Use full row, even if values are unchanged</entry>
</row>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r9849 - in trunk: pt/refman-5.1 refman-5.1 refman-6.0 | jon | 15 Feb |
