Author: paul
Date: 2006-02-02 22:00:39 +0100 (Thu, 02 Feb 2006)
New Revision: 1192
Log:
r2807@kite-hub: paul | 2006-02-02 14:58:10 -0600
Minor revisions.
Modified:
trunk/
trunk/refman-4.1/replication.xml
trunk/refman-5.0/client-utility-programs.xml
trunk/refman-5.0/replication.xml
trunk/refman-5.1/client-utility-programs.xml
trunk/refman-5.1/replication.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7055
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2800
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7055
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2807
Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml 2006-02-02 20:10:51 UTC (rev 1191)
+++ trunk/refman-4.1/replication.xml 2006-02-02 21:00:39 UTC (rev 1192)
@@ -3236,17 +3236,34 @@
<title>&title-replication-rules;</title>
<para>
- The slave server evaluates the <option>--replicate-*</option>
- options as follows to determine whether to execute or ignore a
- statement:
+ If a master server does not write a statement to its binary log,
+ the statement is not replicated. If the server does log the
+ statement, the statement is sent to all slaves and each slave
+ determines whether to execute it or ignore it.
</para>
+ <para>
+ On the master side, decisions about which statements to log are
+ based on the <option>--binlog-do-db</option> and
+ <option>--binlog-ignore-db</option> options that control binary
+ logging. For a description of the rules that the server uses in
+ evaluating these options, see <xref linkend="binary-log"/>.
+ </para>
+
+ <para>
+ On the slave side, decisions about whether to execute or ignore
+ statements received from the master are made according to the
+ <option>--replicate-*</option> options that the slave was started
+ with. The slave evaluates these options using the following
+ procedure.
+ </para>
+
<orderedlist>
<listitem>
<para>
Are there any <option>--replicate-do-db</option> or
- <option>--replicate-ignore-db</option> rules?
+ <option>--replicate-ignore-db</option> options?
</para>
<itemizedlist>
@@ -3254,10 +3271,9 @@
<listitem>
<para>
<emphasis>Yes</emphasis>: Test them using the same rules
- as for <option>--binlog-do-db</option> and
- <option>--binlog-ignore-db</option>. (For a description of
- these rules, see <xref linkend="binary-log"/>.) What is
- the result of the test?
+ as for the <option>--binlog-do-db</option> and
+ <option>--binlog-ignore-db</option> options. What is the
+ result of the test?
</para>
<itemizedlist>
@@ -3290,7 +3306,7 @@
<listitem>
<para>
- Are there any <option>--replicate-*-table</option> rules?
+ Are there any <option>--replicate-*-table</option> options?
</para>
<itemizedlist>
Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml 2006-02-02 20:10:51 UTC (rev 1191)
+++ trunk/refman-5.0/client-utility-programs.xml 2006-02-02 21:00:39 UTC (rev 1192)
@@ -6316,9 +6316,9 @@
<row>
<entry><literal>0a</literal></entry>
<entry><literal>EXEC_LOAD_EVENT</literal></entry>
- <entry>Used for LOAD DATA INFILE statements. The contents of the temporary file
- is stored in the table on the slave. Used in MySQL
- 4 only.</entry>
+ <entry>Used for <literal>LOAD DATA INFILE</literal> statements. The contents of
+ the temporary file is stored in the table on the
+ slave. Used in MySQL 4 only.</entry>
</row>
<row>
<entry><literal>0b</literal></entry>
Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml 2006-02-02 20:10:51 UTC (rev 1191)
+++ trunk/refman-5.0/replication.xml 2006-02-02 21:00:39 UTC (rev 1192)
@@ -3079,17 +3079,34 @@
<title>&title-replication-rules;</title>
<para>
- The slave server evaluates the <option>--replicate-*</option>
- options as follows to determine whether to execute or ignore a
- statement:
+ If a master server does not write a statement to its binary log,
+ the statement is not replicated. If the server does log the
+ statement, the statement is sent to all slaves and each slave
+ determines whether to execute it or ignore it.
</para>
+ <para>
+ On the master side, decisions about which statements to log are
+ based on the <option>--binlog-do-db</option> and
+ <option>--binlog-ignore-db</option> options that control binary
+ logging. For a description of the rules that the server uses in
+ evaluating these options, see <xref linkend="binary-log"/>.
+ </para>
+
+ <para>
+ On the slave side, decisions about whether to execute or ignore
+ statements received from the master are made according to the
+ <option>--replicate-*</option> options that the slave was started
+ with. The slave evaluates these options using the following
+ procedure.
+ </para>
+
<orderedlist>
<listitem>
<para>
Are there any <option>--replicate-do-db</option> or
- <option>--replicate-ignore-db</option> rules?
+ <option>--replicate-ignore-db</option> options?
</para>
<itemizedlist>
@@ -3097,10 +3114,9 @@
<listitem>
<para>
<emphasis>Yes</emphasis>: Test them using the same rules
- as for <option>--binlog-do-db</option> and
- <option>--binlog-ignore-db</option>. (For a description of
- these rules, see <xref linkend="binary-log"/>.) What is
- the result of the test?
+ as for the <option>--binlog-do-db</option> and
+ <option>--binlog-ignore-db</option> options. What is the
+ result of the test?
</para>
<itemizedlist>
@@ -3163,7 +3179,7 @@
<listitem>
<para>
- Are there any <option>--replicate-*-table</option> rules?
+ Are there any <option>--replicate-*-table</option> options?
</para>
<itemizedlist>
Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml 2006-02-02 20:10:51 UTC (rev 1191)
+++ trunk/refman-5.1/client-utility-programs.xml 2006-02-02 21:00:39 UTC (rev 1192)
@@ -6342,9 +6342,9 @@
<row>
<entry><literal>0a</literal></entry>
<entry><literal>EXEC_LOAD_EVENT</literal></entry>
- <entry>Used for LOAD DATA INFILE statements. The contents of the temporary file
- is stored in the table on the slave. Used in MySQL
- 4 only.</entry>
+ <entry>Used for <literal>LOAD DATA INFILE</literal> statements. The contents of
+ the temporary file is stored in the table on the
+ slave. Used in MySQL 4 only.</entry>
</row>
<row>
<entry><literal>0b</literal></entry>
@@ -7214,20 +7214,20 @@
all the databases on the command line.
</para>
</listitem>
-
+
<listitem>
<para>
<option>--all-tablespaces</option>, <option>-Y</option>
</para>
-
+
<para>
- Adds to a table dump all SQL statements needed to create any
- tablespaces used by an <literal>NDB Cluster</literal>
+ Adds to a table dump all SQL statements needed to create
+ any tablespaces used by an <literal>NDB Cluster</literal>
table. This information is not otherwise included in the
output from <command>mysqldump</command>. This option is
currently relevant only to MySQL Cluster tables.
</para>
-
+
<para>
This option was added in MySQL 5.1.6.
</para>
Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml 2006-02-02 20:10:51 UTC (rev 1191)
+++ trunk/refman-5.1/replication.xml 2006-02-02 21:00:39 UTC (rev 1192)
@@ -3260,17 +3260,34 @@
<title>&title-replication-rules;</title>
<para>
- The slave server evaluates the <option>--replicate-*</option>
- options as follows to determine whether to execute or ignore a
- statement:
+ If a master server does not write a statement to its binary log,
+ the statement is not replicated. If the server does log the
+ statement, the statement is sent to all slaves and each slave
+ determines whether to execute it or ignore it.
</para>
+ <para>
+ On the master side, decisions about which statements to log are
+ based on the <option>--binlog-do-db</option> and
+ <option>--binlog-ignore-db</option> options that control binary
+ logging. For a description of the rules that the server uses in
+ evaluating these options, see <xref linkend="binary-log"/>.
+ </para>
+
+ <para>
+ On the slave side, decisions about whether to execute or ignore
+ statements received from the master are made according to the
+ <option>--replicate-*</option> options that the slave was started
+ with. The slave evaluates these options using the following
+ procedure.
+ </para>
+
<orderedlist>
<listitem>
<para>
Are there any <option>--replicate-do-db</option> or
- <option>--replicate-ignore-db</option> rules?
+ <option>--replicate-ignore-db</option> options?
</para>
<itemizedlist>
@@ -3278,10 +3295,9 @@
<listitem>
<para>
<emphasis>Yes</emphasis>: Test them using the same rules
- as for <option>--binlog-do-db</option> and
- <option>--binlog-ignore-db</option>. (For a description of
- these rules, see <xref linkend="binary-log"/>.) What is
- the result of the test?
+ as for the <option>--binlog-do-db</option> and
+ <option>--binlog-ignore-db</option> options. What is the
+ result of the test?
</para>
<itemizedlist>
@@ -3336,7 +3352,7 @@
<listitem>
<para>
- Are there any <option>--replicate-*-table</option> rules?
+ Are there any <option>--replicate-*-table</option> options?
</para>
<itemizedlist>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1192 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 2 Feb |
