Author: paul
Date: 2008-02-22 22:24:33 +0100 (Fri, 22 Feb 2008)
New Revision: 9985
Log:
r29591@arctic: paul | 2008-02-22 15:23:36 -0600
Document bugfix:
Bug #8368 mysqldump needs --slave-data option
Modified:
trunk/dynamic-docs/changelog/mysqld-1.xml
trunk/dynamic-docs/command-optvars/mysqldump.xml
trunk/refman-6.0/programs-client-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:34985
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:29435
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:29583
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:34985
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:29435
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:29591
Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml 2008-02-22 18:51:47 UTC (rev 9984)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml 2008-02-22 21:24:33 UTC (rev 9985)
Changed blocks: 1, Lines Added: 40, Lines Deleted: 0; 1611 bytes
@@ -9283,4 +9283,44 @@
</logentry>
+ <logentry entrytype="feature">
+
+ <tags>
+ <manual type="mysqldump"/>
+ <manual type="dump-slave"/>
+ <manual type="apply-slave-statements"/>
+ <manual type="include-master-host-port"/>
+ </tags>
+
+ <bugs>
+ <fixes bugid="8368"/>
+ </bugs>
+
+ <versions>
+ <version ver="6.0.4"/>
+ </versions>
+
+ <message>
+
+ <para>
+ Three options were added to <command>mysqldump</command> make it
+ easier to generate a dump from a slave server.
+ <option>--dump-slave</option> is similar to
+ <option>--master-data</option>, but the <literal>CHANGE
+ MASTER</literal> statement contains binary log coordinates for
+ the slave's master host, not the slave itself.
+ <option>--apply-slave-statements</option> causes <literal>STOP
+ SLAVE</literal> and <literal>START SLAVE</literal> statements to
+ be added before the <literal>CHANGE MASTER</literal> statement
+ and at the end of the output, respectively.
+ <option>--include-master-host-port</option> causes the
+ <literal>CHANGE MASTER</literal> statement to include
+ <literal>MASTER_PORT</literal> and
+ <literal>MASTER_HOST</literal> options for the slave's master.
+ </para>
+
+ </message>
+
+ </logentry>
+
</changelog>
Modified: trunk/dynamic-docs/command-optvars/mysqldump.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqldump.xml 2008-02-22 18:51:47 UTC (rev 9984)
+++ trunk/dynamic-docs/command-optvars/mysqldump.xml 2008-02-22 21:24:33 UTC (rev 9985)
Changed blocks: 8, Lines Added: 111, Lines Deleted: 20; 4707 bytes
@@ -211,10 +211,40 @@
<manual version="6.0"/>
<manual version="6.0"/>
</versions>
+
</mysqloption>
-
- <mysqloption id="comments">
+ <mysqloption id="apply-slave-statements">
+
+ <xrefto id="option_mysqldump_apply-slave-statements"/>
+
+ <name>apply-slave-statements</name>
+
+ <shortdescription lang="en">
+ Include STOP SLAVE prior to CHANGE MASTER statement and START
+ SLAVE at end of output
+ </shortdescription>
+
+ <types>
+ <optype class="cmdline" format="--apply-slave-statements"/>
+ <optype class="mycnf"/>
+ </types>
+
+ <values vartype="boolean" platform="all">
+
+ <value default="FALSE"/>
+
+ </values>
+
+ <versions>
+ <manual version="6.0"/>
+ <introduced version="6.0.4"/>
+ </versions>
+
+ </mysqloption>
+
+ <mysqloption id="comments">
+
<xrefto id="option_mysqldump_comments"/>
<name>comments</name>
@@ -538,13 +568,15 @@
<name>dump-date</name>
<shortdescription lang="en">
- Include dump date in "Dump completed on" comment if --comments is given
+ Include dump date in "Dump completed on" comment if --comments is
+ given
</shortdescription>
<types>
<optype class="cmdline" format="--dump-date"/>
<optype class="mycnf"/>
</types>
+
<values vartype="boolean" platform="all">
<value default="TRUE"/>
@@ -562,6 +594,37 @@
</mysqloption>
+ <mysqloption id="dump-slave">
+
+ <xrefto id="option_mysqldump_dump-slave"/>
+
+ <name>dump-slave</name>
+
+ <shortdescription lang="en">
+ Include CHANGE MASTER statement that lists binary log coordinates
+ of slave's master
+ </shortdescription>
+
+ <types>
+ <optype class="cmdline" format="--dump-slave[=value]"/>
+ <optype class="mycnf"/>
+ </types>
+
+ <values vartype="numeric" platform="all">
+
+ <choice value="1"/>
+ <choice value="2"/>
+ <value default="1"/>
+
+ </values>
+
+ <versions>
+ <manual version="6.0"/>
+ <introduced version="6.0.4"/>
+ </versions>
+
+ </mysqloption>
+
<mysqloption id="events">
<xrefto id="option_mysqldump_events"/>
@@ -653,8 +716,8 @@
<name>fields-terminated-by</name>
<shortdescription lang="en">
- This option is used with the -T option and has the same meaning
- as the corresponding clause for LOAD DATA INFILE
+ This option is used with the -T option and has the same meaning as
+ the corresponding clause for LOAD DATA INFILE
</shortdescription>
<seealso xref="tab"/>
@@ -901,6 +964,35 @@
</mysqloption>
+ <mysqloption id="include-master-host-port">
+
+ <xrefto id="option_mysqldump_include-master-host-port"/>
+
+ <name>include-master-host-port</name>
+
+ <shortdescription lang="en">
+ Include MASTER_HOST/MASTER_PORT options in CHANGE MASTER statement
+ produced with --dump-slave
+ </shortdescription>
+
+ <types>
+ <optype class="cmdline" format="--include-master-host-port"/>
+ <optype class="mycnf"/>
+ </types>
+
+ <values vartype="boolean" platform="all">
+
+ <value default="FALSE"/>
+
+ </values>
+
+ <versions>
+ <manual version="6.0"/>
+ <introduced version="6.0.4"/>
+ </versions>
+
+ </mysqloption>
+
<mysqloption id="insert-ignore">
<xrefto id="option_mysqldump_insert-ignore"/>
@@ -2154,22 +2246,22 @@
</versions>
</mysqloption>
-
+
<mysqloption id="version">
-
+
<xrefto id="option_mysqldump_version"/>
-
+
<name>version</name>
-
+
<shortdescription lang="en">
Display version information and exit
</shortdescription>
-
+
<types>
<optype class="cmdline" format="--version"/>
<optype class="cmdline" format="-V"/>
</types>
-
+
<versions>
<manual version="4.1"/>
<manual version="5.0"/>
@@ -2177,24 +2269,24 @@
<manual version="5.2"/>
<manual version="6.0"/>
</versions>
-
+
</mysqloption>
-
+
<mysqloption id="verbose">
-
+
<xrefto id="option_mysqldump_verbose"/>
-
+
<name>verbose</name>
-
+
<shortdescription lang="en">
Verbose mode
</shortdescription>
-
+
<types>
<optype class="cmdline" format="--verbose"/>
<optype class="cmdline" format="-v"/>
</types>
-
+
<versions>
<manual version="4.1"/>
<manual version="5.0"/>
@@ -2202,8 +2294,7 @@
<manual version="5.2"/>
<manual version="6.0"/>
</versions>
-
+
</mysqloption>
-
</mysqloptions>
Modified: trunk/refman-6.0/programs-client-core.xml
===================================================================
--- trunk/refman-6.0/programs-client-core.xml 2008-02-22 18:51:47 UTC (rev 9984)
+++ trunk/refman-6.0/programs-client-core.xml 2008-02-22 21:24:33 UTC (rev 9985)
Changed blocks: 3, Lines Added: 82, Lines Deleted: 0; 3772 bytes
@@ -5050,6 +5050,31 @@
</listitem>
<listitem>
+ <para id="option_mysqldump_apply-slave-statements">
+ <indexterm>
+ <primary>mysqldump</primary>
+ <secondary>apply-slave-statements option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>apply-slave-statements option</primary>
+ <secondary>mysqldump</secondary>
+ </indexterm>
+
+ <option>--apply-slave-statements</option>
+ </para>
+
+ <para>
+ For a slave dump produced with the
+ <option>--dump-slave</option> option, add a <literal>STOP
+ SLAVE</literal> statement before the <literal>CHANGE
+ MASTER</literal> statement and a <literal>START
+ SLAVE</literal> statement at the end of the output. This
+ option was added in MySQL 6.0.4.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_mysqldump_character-sets-dir">
<indexterm>
<primary>mysqldump</primary>
@@ -5445,6 +5470,38 @@
</listitem>
<listitem>
+ <para id="option_mysqldump_dump-slave">
+ <indexterm>
+ <primary>mysqldump</primary>
+ <secondary>dump-slave option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>dump-slave option</primary>
+ <secondary>mysqldump</secondary>
+ </indexterm>
+
+ <option>--dump-slave[=<replaceable>value</replaceable>]</option>
+ </para>
+
+ <para>
+ This option is used to dump a replication slave server and
+ causes the output to include a <literal>CHANGE
+ MASTER</literal> statement that indicates the binary log
+ coordinates for the slave's master server. The option value
+ is handled the same way as for
+ <option>--master-data</option>. This option was added in
+ MySQL 6.0.4.
+ </para>
+
+ <para>
+ The <option>--apply-slave-statements</option> and
+ <option>--include-master-host-port</option> options may also
+ be used with <option>--dump-slave</option>.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_mysqldump_events">
<indexterm>
<primary>mysqldump</primary>
@@ -5704,6 +5761,31 @@
</listitem>
<listitem>
+ <para id="option_mysqldump_include-master-host-port">
+ <indexterm>
+ <primary>mysqldump</primary>
+ <secondary>include-master-host-port option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>include-master-host-port option</primary>
+ <secondary>mysqldump</secondary>
+ </indexterm>
+
+ <option>--include-master-host-port</option>
+ </para>
+
+ <para>
+ For the <literal>CHANGE MASTER</literal> statement in a
+ slave dump produced with the <option>--dump-slave</option>
+ option, add <literal>MASTER_PORT</literal> and
+ <literal>MASTER_PORT</literal> options for the host name and
+ TCP/IP port number of the slave's master. This option was
+ added in MySQL 6.0.4.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_mysqldump_ignore-table">
<indexterm>
<primary>mysqldump</primary>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r9985 - in trunk: . dynamic-docs/changelog dynamic-docs/command-optvars refman-6.0 | paul | 22 Feb |
