bk commit - mysqldoc@docsrva tree (paul:1.2990)

[paul]

Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2990 05/07/11 14:14:20 paul@stripped +2 -0
  Add step to whether-to-replication decision tree.

  refman/replication.xml
    1.5 05/07/11 14:14:19 paul@stripped +17 -3
    Add step to whether-to-replication decision tree.

  refman-5.0/replication.xml
    1.5 05/07/11 14:14:19 paul@stripped +17 -3
    Sync.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	paul
# Host:	kite-hub.kitebird.com
# Root:	/src/extern/MySQL/bk/mysqldoc

--- 1.4/refman-5.0/replication.xml	2005-07-08 09:38:03 -05:00
+++ 1.5/refman-5.0/replication.xml	2005-07-11 14:14:19 -05:00
@@ -3032,12 +3032,10 @@
     Examples:
    </para>
 
-   <para>
 <programlisting>
 --slave-skip-errors=1062,1053
 --slave-skip-errors=all
-</programlisting>
-   </para></listitem>
+</programlisting></listitem>
 
   </itemizedlist>
 
@@ -3073,6 +3071,22 @@
      </para></listitem>
 
     </itemizedlist></listitem>
+
+    <listitem><para>
+     No: Go to the next step.
+    </para></listitem>
+
+   </itemizedlist></listitem>
+
+   <listitem><para>
+    Are we in the execution of a stored procedure or function?
+   </para>
+
+   <itemizedlist>
+
+    <listitem><para>
+     Yes: Execute the query and exit.
+    </para></listitem>
 
     <listitem><para>
      No: Go to the next step.

--- 1.4/refman/replication.xml	2005-07-08 09:38:03 -05:00
+++ 1.5/refman/replication.xml	2005-07-11 14:14:19 -05:00
@@ -3032,12 +3032,10 @@
     Examples:
    </para>
 
-   <para>
 <programlisting>
 --slave-skip-errors=1062,1053
 --slave-skip-errors=all
-</programlisting>
-   </para></listitem>
+</programlisting></listitem>
 
   </itemizedlist>
 
@@ -3073,6 +3071,22 @@
      </para></listitem>
 
     </itemizedlist></listitem>
+
+    <listitem><para>
+     No: Go to the next step.
+    </para></listitem>
+
+   </itemizedlist></listitem>
+
+   <listitem><para>
+    Are we in the execution of a stored procedure or function?
+   </para>
+
+   <itemizedlist>
+
+    <listitem><para>
+     Yes: Execute the query and exit.
+    </para></listitem>
 
     <listitem><para>
      No: Go to the next step.