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

[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.3022 05/07/14 14:01:44 paul@stripped +3 -0
  For --master-data, binlog should be enabled.

  refman/client-side-scripts.xml
    1.2 05/07/14 14:01:43 paul@stripped +9 -8
    For --master-data, binlog should be enabled.

  refman-5.0/client-side-scripts.xml
    1.2 05/07/14 14:01:43 paul@stripped +9 -8
    Sync.

  refman-4.1/client-side-scripts.xml
    1.2 05/07/14 14:01:43 paul@stripped +9 -8
    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.1/refman-4.1/client-side-scripts.xml	2005-06-16 14:35:22 -05:00
+++ 1.2/refman-4.1/client-side-scripts.xml	2005-07-14 14:01:43 -05:00
@@ -5367,14 +5367,15 @@
    <para>
     This option causes the binary log position and filename to be
     written to the output. This option requires the
-    <literal>RELOAD</literal> privilege. If the option value is equal to
-    1, the position and filename are written to the dump output in the
-    form of a <literal>CHANGE MASTER</literal> statement that makes a
-    slave server start from the correct position in the master's binary
-    logs if you use this SQL dump of the master to set up a slave. If
-    the option value is equal to 2, the <literal>CHANGE MASTER</literal>
-    statement is written as an SQL comment. This is the default action
-    if <replaceable>value</replaceable> is omitted.
+    <literal>RELOAD</literal> privilege and the binary log must be
+    enabled. If the option value is equal to 1, the position and
+    filename are written to the dump output in the form of a
+    <literal>CHANGE MASTER</literal> statement that makes a slave server
+    start from the correct position in the master's binary logs if you
+    use this SQL dump of the master to set up a slave. If the option
+    value is equal to 2, the <literal>CHANGE MASTER</literal> statement
+    is written as an SQL comment. This is the default action if
+    <replaceable>value</replaceable> is omitted.
     <replaceable>value</replaceable> may be given as of MySQL 4.1.8;
     before that, do not specify an option value.
    </para>

--- 1.1/refman-5.0/client-side-scripts.xml	2005-06-16 14:46:21 -05:00
+++ 1.2/refman-5.0/client-side-scripts.xml	2005-07-14 14:01:43 -05:00
@@ -5367,14 +5367,15 @@
    <para>
     This option causes the binary log position and filename to be
     written to the output. This option requires the
-    <literal>RELOAD</literal> privilege. If the option value is equal to
-    1, the position and filename are written to the dump output in the
-    form of a <literal>CHANGE MASTER</literal> statement that makes a
-    slave server start from the correct position in the master's binary
-    logs if you use this SQL dump of the master to set up a slave. If
-    the option value is equal to 2, the <literal>CHANGE MASTER</literal>
-    statement is written as an SQL comment. This is the default action
-    if <replaceable>value</replaceable> is omitted.
+    <literal>RELOAD</literal> privilege and the binary log must be
+    enabled. If the option value is equal to 1, the position and
+    filename are written to the dump output in the form of a
+    <literal>CHANGE MASTER</literal> statement that makes a slave server
+    start from the correct position in the master's binary logs if you
+    use this SQL dump of the master to set up a slave. If the option
+    value is equal to 2, the <literal>CHANGE MASTER</literal> statement
+    is written as an SQL comment. This is the default action if
+    <replaceable>value</replaceable> is omitted.
     <replaceable>value</replaceable> may be given as of MySQL 4.1.8;
     before that, do not specify an option value.
    </para>

--- 1.1/refman/client-side-scripts.xml	2005-06-15 18:46:57 -05:00
+++ 1.2/refman/client-side-scripts.xml	2005-07-14 14:01:43 -05:00
@@ -5367,14 +5367,15 @@
    <para>
     This option causes the binary log position and filename to be
     written to the output. This option requires the
-    <literal>RELOAD</literal> privilege. If the option value is equal to
-    1, the position and filename are written to the dump output in the
-    form of a <literal>CHANGE MASTER</literal> statement that makes a
-    slave server start from the correct position in the master's binary
-    logs if you use this SQL dump of the master to set up a slave. If
-    the option value is equal to 2, the <literal>CHANGE MASTER</literal>
-    statement is written as an SQL comment. This is the default action
-    if <replaceable>value</replaceable> is omitted.
+    <literal>RELOAD</literal> privilege and the binary log must be
+    enabled. If the option value is equal to 1, the position and
+    filename are written to the dump output in the form of a
+    <literal>CHANGE MASTER</literal> statement that makes a slave server
+    start from the correct position in the master's binary logs if you
+    use this SQL dump of the master to set up a slave. If the option
+    value is equal to 2, the <literal>CHANGE MASTER</literal> statement
+    is written as an SQL comment. This is the default action if
+    <replaceable>value</replaceable> is omitted.
     <replaceable>value</replaceable> may be given as of MySQL 4.1.8;
     before that, do not specify an option value.
    </para>