From: stefan
Date: December 22 2005 7:42pm
Subject: svn commit - mysqldoc@docsrva: r624 - trunk/refman-5.1
List-Archive: http://lists.mysql.com/commits/371
Message-Id: <200512221942.jBMJgD1t031714@docsrva.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: shinz
Date: 2005-12-22 20:42:12 +0100 (Thu, 22 Dec 2005)
New Revision: 624

Log:
Row-based replication code has been pushed -- comment out RBR documentation

Modified:
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/replication.xml

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2005-12-22 17:14:54 UTC (rev 623)
+++ trunk/refman-5.1/database-administration.xml	2005-12-22 19:42:12 UTC (rev 624)
@@ -2131,7 +2131,6 @@
             </para>
           </listitem>
 
-<!-- Uncomment when RBR is in place
           <listitem>
             <para>
               <option>- -binlog-format={row|statement}</option>
@@ -2140,10 +2139,10 @@
             <para>
               Determine whether to use row-based or statement-based
               replication (statement-based is default).
+              Available as of MySQL 5.1.5.
               See <xref linkend="replication-row-based"/>.
             </para>
           </listitem>
-           -->
 
           <listitem>
             <para>

Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml	2005-12-22 17:14:54 UTC (rev 623)
+++ trunk/refman-5.1/replication.xml	2005-12-22 19:42:12 UTC (rev 624)
@@ -89,16 +89,6 @@
       server. Otherwise, you must always be careful to avoid conflicts
       between updates that users make to tables on the master and
       updates that they make to tables on the slave.
-    </para>
-
-<!-- Remove the previous paragraph and replace it with the following
-     one when we have RBR in place:
-    <para>
-      Note that when you are using replication, all updates to the
-      tables that are replicated should be performed on the master
-      server. Otherwise, you must always be careful to avoid conflicts
-      between updates that users make to tables on the master and
-      updates that they make to tables on the slave.
       When performing updates on the slaves's side you should also keep
       in mind that these might work with statement-based replication,
       but not with row-based replication. Consider the following
@@ -120,7 +110,10 @@
       <emphasis>not</emphasis> include the record inserted on the slave.
       As a consequence, replication will break.
     </para> 
-    -->
+    <para>
+      For information about row-based replication (RBR), see
+      <xref linkend="replication-row-based"/>.
+    </para>
 
     <para>
       One-way replication has benefits for robustness, speed, and system
@@ -237,9 +230,6 @@
 
   </section>
 
-<!-- Uncomment when RBR is in place
-     Remember to uncomment the - -binlog-format item in
-     database-administration.xml, too!
   <section id="replication-row-based">
    <title>
      &title-replication-row-based;
@@ -252,8 +242,7 @@
      see <xref linkend="stored-procedure-logging"/>.
    </para>
    <para>
-     Note that in MySQL &current-series; RBR is only available in the
-    <literal>-max</literal> builds.
+     Row-based replication is available as of MySQL 5.1.5.
    </para>
    <para>
      If you're building MySQL from source, it must be compiled with 
@@ -358,7 +347,6 @@
      value will be 1024.
    </para>
   </section>
--->
 
   <section id="replication-implementation-details">
 
@@ -1640,15 +1628,13 @@
         the downgrade.
       </para>
 
-<!-- Uncomment when RBR is in place
-        <para>
+      <para>
         Note that downgrading a replication setup to a previous version
         cannot be done once you've switched from statement-based to
         row-based replication, and after the first row-based statement
         has been written to the binlog. See 
         <xref linkend="replication-row-based"/>.
       </para>
--->
 
     </section>
 
@@ -1706,13 +1692,6 @@
     </para>
 
     <para>
-      Replication issues with regard to stored routines and triggers is
-      described in <xref linkend="stored-procedure-logging"/>.
-    </para>
-
-<!-- Remove the previous paragraph and replace it with the following
-     one when we have RBR in place:
-    <para>
       With MySQL's classic statement-based replication, there may be
       issues with replicating stored routines or triggers. You can avoid
       these issues by using MySQL's row-based replication (RBR) instead.
@@ -1721,7 +1700,6 @@
       For a description of row-based replication, see
       <xref linkend="replication-row-based"/>.
     </para>
--->
 
     <itemizedlist>
 
@@ -4153,7 +4131,6 @@
       your own monitoring tools.
     </para>
 
-<!-- Uncomment when RBR is in place
     <para>
       <emphasis role="bold">Q</emphasis>:
       How do I tell which format I'm currently running (row-based or 
@@ -4175,12 +4152,10 @@
       <emphasis role="bold">A</emphasis>:
       The slave automatically knows which format it should use.
     </para>
--->
 
   </section>
 
-<!-- Uncomment when RBR is in place
-    <section id="replication-sbr-rbr">
+  <section id="replication-sbr-rbr">
     <title>&title-replication-sbr-rbr;</title>
 
     <para>
@@ -4265,11 +4240,11 @@
           <listitem><para>
             <literal>FOUND_ROWS()</literal>
           </para></listitem>
+         </itemizedlist>
           All other functions are replicated correctly 
           (including <literal>RAND()</literal>, 
           <literal>NOW()</literal>, 
           <literal>LOAD DATA INFILE</literal>, an so forth).
-         </itemizedlist>
        </para></listitem>
        <listitem><para>
          <literal>INSERT &hellip; SELECT</literal> requires more 
@@ -4403,7 +4378,6 @@
       </para></listitem>
      </itemizedlist>
     </para>
--->
 
   <section id="replication-problems">
 
@@ -4654,7 +4628,6 @@
       with as much information as possible.
     </para>
 
-<!-- Uncomment when RBR is in place
     <para>
       <emphasis role="bold">Q</emphasis>:
       How do I tell which format I'm currently running (row-based or 
@@ -4676,7 +4649,6 @@
       <emphasis role="bold">A</emphasis>:
       The slave automatically knows which format it should use.
     </para>
--->
 
   </section>
 
@@ -4823,5 +4795,5 @@
     </para>
 
   </section>
-
+</section>
 </chapter>