List:Commits« Previous MessageNext Message »
From:paul Date:January 4 2006 7:55pm
Subject:svn commit - mysqldoc@docsrva: r678 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common
View as plain text  
Author: paul
Date: 2006-01-04 20:55:11 +0100 (Wed, 04 Jan 2006)
New Revision: 678

Log:
 r5847@frost:  paul | 2006-01-04 13:52:46 -0600
 Split replication-rule evaluation into separate section.


Modified:
   trunk/
   trunk/refman-4.1/replication.xml
   trunk/refman-5.0/replication.xml
   trunk/refman-5.1/replication.xml
   trunk/refman-common/titles.en.ent


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:5846
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1848
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:5847
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1848

Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml	2006-01-04 19:54:54 UTC (rev 677)
+++ trunk/refman-4.1/replication.xml	2006-01-04 19:55:11 UTC (rev 678)
@@ -2727,7 +2727,7 @@
           or no database. If you need cross-database updates to work,
           make sure that you have MySQL 3.23.28 or later, and use
           <option>--replicate-wild-do-table=<replaceable>db_name</replaceable>.%</option>.
-          Please read the notes that follow this option list.
+          See <xref linkend="replication-rules"/>.
         </para>
 
         <para>
@@ -2771,8 +2771,8 @@
           specified table. To specify more than one table, use this
           option multiple times, once for each table. This works for
           cross-database updates, in contrast to
-          <option>--replicate-do-db</option>. Please read the notes that
-          follow this option list.
+          <option>--replicate-do-db</option>. See
+          <xref linkend="replication-rules"/>.
         </para>
       </listitem>
 
@@ -2788,8 +2788,8 @@
           To specify more than one database to ignore, use this option
           multiple times, once for each database. You should not use
           this option if you are using cross-database updates and you do
-          not want these updates to be replicated. Please read the notes
-          that follow this option list.
+          not want these updates to be replicated. See
+          <xref linkend="replication-rules"/>.
         </para>
 
         <para>
@@ -2824,8 +2824,8 @@
           updated by the same statement). To specify more than one table
           to ignore, use this option multiple times, once for each
           table. This works for cross-database updates, in contrast to
-          <option>--replicate-ignore-db</option>. Please read the notes
-          that follow this option list.
+          <option>--replicate-ignore-db</option>. See
+          <xref linkend="replication-rules"/>.
         </para>
       </listitem>
 
@@ -2843,8 +2843,8 @@
           have the same meaning as for the <literal>LIKE</literal>
           pattern-matching operator. To specify more than one table, use
           this option multiple times, once for each table. This works
-          for cross-database updates. Please read the notes that follow
-          this option list.
+          for cross-database updates. See
+          <xref linkend="replication-rules"/>.
         </para>
 
         <para>
@@ -2891,8 +2891,8 @@
           Tells the slave thread to not replicate a statement where any
           table matches the given wildcard pattern. To specify more than
           one table to ignore, use this option multiple times, once for
-          each table. This works for cross-database updates. Please read
-          the notes that follow this option list.
+          each table. This works for cross-database updates. See
+          <xref linkend="replication-rules"/>.
         </para>
 
         <para>
@@ -3137,6 +3137,12 @@
 
     </itemizedlist>
 
+  </section>
+
+  <section id="replication-rules">
+
+    <title>&title-replication-rules;</title>
+
     <para>
       The slave server evaluates the <option>--replicate-*</option>
       rules as follows to determine whether to execute or ignore a

Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml	2006-01-04 19:54:54 UTC (rev 677)
+++ trunk/refman-5.0/replication.xml	2006-01-04 19:55:11 UTC (rev 678)
@@ -2572,7 +2572,7 @@
           or no database. If you need cross-database updates to work,
           use
           <option>--replicate-wild-do-table=<replaceable>db_name</replaceable>.%</option>.
-          Please read the notes that follow this option list.
+          See <xref linkend="replication-rules"/>.
         </para>
 
         <para>
@@ -2616,8 +2616,8 @@
           specified table. To specify more than one table, use this
           option multiple times, once for each table. This works for
           cross-database updates, in contrast to
-          <option>--replicate-do-db</option>. Please read the notes that
-          follow this option list.
+          <option>--replicate-do-db</option>. See
+          <xref linkend="replication-rules"/>.
         </para>
       </listitem>
 
@@ -2633,8 +2633,8 @@
           To specify more than one database to ignore, use this option
           multiple times, once for each database. You should not use
           this option if you are using cross-database updates and you do
-          not want these updates to be replicated. Please read the notes
-          that follow this option list.
+          not want these updates to be replicated. See
+          <xref linkend="replication-rules"/>.
         </para>
 
         <para>
@@ -2669,8 +2669,8 @@
           updated by the same statement). To specify more than one table
           to ignore, use this option multiple times, once for each
           table. This works for cross-database updates, in contrast to
-          <option>--replicate-ignore-db</option>. Please read the notes
-          that follow this option list.
+          <option>--replicate-ignore-db</option>. See
+          <xref linkend="replication-rules"/>.
         </para>
       </listitem>
 
@@ -2688,8 +2688,8 @@
           have the same meaning as for the <literal>LIKE</literal>
           pattern-matching operator. To specify more than one table, use
           this option multiple times, once for each table. This works
-          for cross-database updates. Please read the notes that follow
-          this option list.
+          for cross-database updates. See
+          <xref linkend="replication-rules"/>.
         </para>
 
         <para>
@@ -2736,8 +2736,8 @@
           Tells the slave thread to not replicate a statement where any
           table matches the given wildcard pattern. To specify more than
           one table to ignore, use this option multiple times, once for
-          each table. This works for cross-database updates. Please read
-          the notes that follow this option list.
+          each table. This works for cross-database updates. See
+          <xref linkend="replication-rules"/>.
         </para>
 
         <para>
@@ -2973,6 +2973,12 @@
 
     </itemizedlist>
 
+  </section>
+
+  <section id="replication-rules">
+
+    <title>&title-replication-rules;</title>
+
     <para>
       The slave server evaluates the <option>--replicate-*</option>
       rules as follows to determine whether to execute or ignore a

Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml	2006-01-04 19:54:54 UTC (rev 677)
+++ trunk/refman-5.1/replication.xml	2006-01-04 19:55:11 UTC (rev 678)
@@ -2756,7 +2756,7 @@
           or no database. If you need cross-database updates to work,
           use
           <option>--replicate-wild-do-table=<replaceable>db_name</replaceable>.%</option>.
-          Please read the notes that follow this option list.
+          See <xref linkend="replication-rules"/>.
         </para>
 
         <para>
@@ -2800,8 +2800,8 @@
           specified table. To specify more than one table, use this
           option multiple times, once for each table. This works for
           cross-database updates, in contrast to
-          <option>--replicate-do-db</option>. Please read the notes that
-          follow this option list.
+          <option>--replicate-do-db</option>. See
+          <xref linkend="replication-rules"/>.
         </para>
       </listitem>
 
@@ -2817,8 +2817,8 @@
           To specify more than one database to ignore, use this option
           multiple times, once for each database. You should not use
           this option if you are using cross-database updates and you do
-          not want these updates to be replicated. Please read the notes
-          that follow this option list.
+          not want these updates to be replicated. See
+          <xref linkend="replication-rules"/>.
         </para>
 
         <para>
@@ -2853,8 +2853,8 @@
           updated by the same statement). To specify more than one table
           to ignore, use this option multiple times, once for each
           table. This works for cross-database updates, in contrast to
-          <option>--replicate-ignore-db</option>. Please read the notes
-          that follow this option list.
+          <option>--replicate-ignore-db</option>. See
+          <xref linkend="replication-rules"/>.
         </para>
       </listitem>
 
@@ -2872,8 +2872,8 @@
           have the same meaning as for the <literal>LIKE</literal>
           pattern-matching operator. To specify more than one table, use
           this option multiple times, once for each table. This works
-          for cross-database updates. Please read the notes that follow
-          this option list.
+          for cross-database updates. See
+          <xref linkend="replication-rules"/>.
         </para>
 
         <para>
@@ -2920,8 +2920,8 @@
           Tells the slave thread to not replicate a statement where any
           table matches the given wildcard pattern. To specify more than
           one table to ignore, use this option multiple times, once for
-          each table. This works for cross-database updates. Please read
-          the notes that follow this option list.
+          each table. This works for cross-database updates. See
+          <xref linkend="replication-rules"/>.
         </para>
 
         <para>
@@ -3157,6 +3157,12 @@
 
     </itemizedlist>
 
+  </section>
+
+  <section id="replication-rules">
+
+    <title>&title-replication-rules;</title>
+
     <para>
       The slave server evaluates the <option>--replicate-*</option>
       rules as follows to determine whether to execute or ignore a

Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent	2006-01-04 19:54:54 UTC (rev 677)
+++ trunk/refman-common/titles.en.ent	2006-01-04 19:55:11 UTC (rev 678)
@@ -1431,6 +1431,7 @@
 <!ENTITY title-replication-options "Replication Startup Options">
 <!ENTITY title-replication-problems "Troubleshooting Replication">
 <!ENTITY title-replication-row-based "Row-Based Replication">
+<!ENTITY title-replication-rules "How Servers Evaluate Replication Rules">
 <!ENTITY title-replication-sbr-rbr "Comparison of Statement-Based Versus Row-Based Replication">
 <!ENTITY title-replication-slave-sql "SQL Statements for Controlling Slave Servers">
 <!ENTITY title-replication-sql "Replication Statements">

Thread
svn commit - mysqldoc@docsrva: r678 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-commonpaul4 Jan