Author: paul
Date: 2009-02-13 04:11:43 +0100 (Fri, 13 Feb 2009)
New Revision: 13744
Log:
r38564@frost: paul | 2009-02-12 21:13:52 -0500
Reformat
Modified:
trunk/dynamic-docs/changelog/mysqld-1.xml
trunk/dynamic-docs/changelog/mysqld.xml
trunk/refman-4.1/dba-mysqld-server-core.xml
trunk/refman-4.1/installing.xml
trunk/refman-4.1/news-3.23.xml
trunk/refman-4.1/news-4.0.xml
trunk/refman-4.1/programs-client.xml
trunk/refman-4.1/replication-options-core.xml
trunk/refman-4.1/se-innodb-core.xml
trunk/refman-5.0/dba-mysqld-server-core.xml
trunk/refman-5.0/mysql-cluster-management.xml
trunk/refman-5.0/programs-client-core.xml
trunk/refman-5.0/replication-options-core.xml
trunk/refman-5.0/se-innodb-core.xml
trunk/refman-5.1/dba-mysqld-server-core.xml
trunk/refman-5.1/events.xml
trunk/refman-5.1/installing-core.xml
trunk/refman-5.1/introduction.xml
trunk/refman-5.1/mysql-cluster-management.xml
trunk/refman-5.1/programs-client-core.xml
trunk/refman-5.1/replication-options-core.xml
trunk/refman-5.1/se-innodb-core.xml
trunk/refman-6.0/dba-mysqld-server-core.xml
trunk/refman-6.0/events.xml
trunk/refman-6.0/programs-client-core.xml
trunk/refman-6.0/replication-options-core.xml
trunk/refman-6.0/se-innodb-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:41755
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:38563
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:36139
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:41755
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:38564
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:36139
Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 7; 2051 bytes
@@ -20645,9 +20645,9 @@
<para>
<command>mysql</command> stripped comments from statements sent
to the server. Now the <option>--comments</option> or
- <option role="mysqldump">--skip-comments</option> option can be used to control
- whether to retain or strip comments. The default is
- <option role="mysqldump">--skip-comments</option>.
+ <option role="mysqldump">--skip-comments</option> option can be
+ used to control whether to retain or strip comments. The default
+ is <option role="mysqldump">--skip-comments</option>.
</para>
</message>
@@ -24644,14 +24644,15 @@
<option role="mysqldump">--master-data</option>, but the
<literal role="stmt">CHANGE MASTER TO</literal> statement
contains binary log coordinates for the slave's master host, not
- the slave itself. <option role="mysqldump">--apply-slave-statements</option>
+ the slave itself.
+ <option role="mysqldump">--apply-slave-statements</option>
causes <literal role="stmt">STOP SLAVE</literal> and
<literal role="stmt">START SLAVE</literal> statements to be
added before the <literal role="stmt">CHANGE MASTER TO</literal>
statement and at the end of the output, respectively.
- <option role="mysqldump">--include-master-host-port</option> causes the
- <literal role="stmt">CHANGE MASTER TO</literal> statement to
- include <literal>MASTER_PORT</literal> and
+ <option role="mysqldump">--include-master-host-port</option>
+ causes the <literal role="stmt">CHANGE MASTER TO</literal>
+ statement to include <literal>MASTER_PORT</literal> and
<literal>MASTER_HOST</literal> options for the slave's master.
</para>
Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/dynamic-docs/changelog/mysqld.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 20, Lines Added: 50, Lines Deleted: 41; 9781 bytes
@@ -5181,8 +5181,8 @@
<command>mysqldump</command> wrote an extra pair of
<literal role="stmt">DROP DATABASE</literal> and
<literal role="stmt">CREATE DATABASE</literal> statements if run
- with the <option role="mysqldump">--add-drop-database</option> option and the
- database contained views.
+ with the <option role="mysqldump">--add-drop-database</option>
+ option and the database contained views.
</para>
</message>
@@ -7127,7 +7127,8 @@
<para>
The <option role="mysqldump">--opt</option> option for
<command>mysqldump</command> now is enabled by default, as are
- all the options implied by <option role="mysqldump">--opt</option>.
+ all the options implied by
+ <option role="mysqldump">--opt</option>.
</para>
</message>
@@ -12683,8 +12684,8 @@
database included any views. The recreation of views requires
the creation and removal of temporary tables. This option
suppressed the removal of those temporary tables. The same
- applied to <option role="mysqldump">--compact</option> since this option also
- invokes <option>--skip-add-drop-table</option>.
+ applied to <option role="mysqldump">--compact</option> since
+ this option also invokes <option>--skip-add-drop-table</option>.
</para>
</message>
@@ -19331,8 +19332,9 @@
<para>
<command>mysqldump --triggers</command> did not quote
- identifiers properly if the <option role="mysqldump">--compatible</option> option
- was given, so the dump output could not be reloaded.
+ identifiers properly if the
+ <option role="mysqldump">--compatible</option> option was given,
+ so the dump output could not be reloaded.
</para>
</message>
@@ -21115,8 +21117,8 @@
<message ver="5.0.7">
<para>
- The <option role="mysqldump">--delayed-insert</option> option for
- <command>mysqldump</command> was disabled to avoid causing
+ The <option role="mysqldump">--delayed-insert</option> option
+ for <command>mysqldump</command> was disabled to avoid causing
problems with storage engines that do not support
<literal>INSERT DELAYED</literal>.
</para>
@@ -27498,7 +27500,8 @@
<para>
<command>mysqldump</command> did not respect the order of tables
- named with the <option role="mysqldump">--tables</option> option.
+ named with the <option role="mysqldump">--tables</option>
+ option.
</para>
</message>
@@ -32995,8 +32998,8 @@
<para>
<command>mysqldump</command> crashed using the
- <option role="mysqldump">--complete-insert</option> option while dumping tables
- with a large number of long column names.
+ <option role="mysqldump">--complete-insert</option> option while
+ dumping tables with a large number of long column names.
</para>
</message>
@@ -33265,7 +33268,8 @@
<para>
The <command>mysqldump</command> utility now supports an option
for dumping tablespaces. Use <option>-Y</option> or
- <option role="mysqldump">--all-tablespaces</option> to enable this functionality.
+ <option role="mysqldump">--all-tablespaces</option> to enable
+ this functionality.
</para>
</message>
@@ -43780,7 +43784,8 @@
<note>
<para>
- The working of the <option role="mysqldump">--all-tablespaces</option> or
+ The working of the
+ <option role="mysqldump">--all-tablespaces</option> or
<option>-Y</option> option for <command>mysqldump</command>
remains unaffected by this change.
</para>
@@ -66322,8 +66327,8 @@
<message>
<para>
- Added the <option role="mysqldump">--add-drop-database</option> option to
- <literal>mysqldump</literal>.
+ Added the <option role="mysqldump">--add-drop-database</option>
+ option to <literal>mysqldump</literal>.
</para>
</message>
@@ -68108,8 +68113,8 @@
<para>
When <command>mysqldump</command> is invoked with the
- <option role="mysqldump">--routines</option> option, it now dumps the
- <literal>DEFINER</literal> value for stored routines.
+ <option role="mysqldump">--routines</option> option, it now
+ dumps the <literal>DEFINER</literal> value for stored routines.
</para>
</message>
@@ -71257,9 +71262,9 @@
<message>
<para>
- Added the <option role="mysqldump">--set-charset</option> option to
- <command>mysqlbinlog</command> to allow the character set to be
- specified for processing binary log files.
+ Added the <option role="mysqldump">--set-charset</option> option
+ to <command>mysqlbinlog</command> to allow the character set to
+ be specified for processing binary log files.
</para>
</message>
@@ -79764,11 +79769,11 @@
<para>
When <command>mysqldump</command> was run with the
- <option role="mysqldump">--delete-master-logs</option> option, binary log files
- were deleted before it was known that the dump had succeeded,
- not after. (The method for removing log files used
- <literal role="stmt">RESET MASTER</literal> prior to the dump.
- This also reset the binary log sequence numbering to
+ <option role="mysqldump">--delete-master-logs</option> option,
+ binary log files were deleted before it was known that the dump
+ had succeeded, not after. (The method for removing log files
+ used <literal role="stmt">RESET MASTER</literal> prior to the
+ dump. This also reset the binary log sequence numbering to
<literal>.000001</literal>.) Now <command>mysqldump</command>
flushes the logs (which creates a new binary log number with the
next sequence number), performs the dump, and then uses
@@ -85571,8 +85576,8 @@
<para>
<command>mysqldump</command> now has a
- <option role="mysqldump">--flush-privileges</option> option. It causes
- <command>mysqldump</command> to emit a
+ <option role="mysqldump">--flush-privileges</option> option. It
+ causes <command>mysqldump</command> to emit a
<literal role="stmt" condition="flush">FLUSH
PRIVILEGES</literal> statement after dumping the
<literal>mysql</literal> database. This option should be used
@@ -95215,8 +95220,9 @@
<para>
<command>mysqldump</command> dumped core when invoked with
- <option>--tmp</option> and <option role="mysqldump">--single-transaction</option>
- options and a non-existent table name.
+ <option>--tmp</option> and
+ <option role="mysqldump">--single-transaction</option> options
+ and a non-existent table name.
</para>
</message>
@@ -96030,8 +96036,8 @@
<para>
<command>mysqldump</command> crashed for
<literal>MERGE</literal> tables if the
- <option role="mysqldump">--complete-insert</option> (<option>-c</option>) option
- was given.
+ <option role="mysqldump">--complete-insert</option>
+ (<option>-c</option>) option was given.
</para>
</message>
@@ -113185,12 +113191,13 @@
<para>
When dumping procedures, <command>mysqldump
- <option role="mysqldump">--compact</option> </command> generated output that
- restored the session variable
+ <option role="mysqldump">--compact</option> </command> generated
+ output that restored the session variable
<literal role="sysvar">sql_mode</literal> without first
capturing it. When dumping routines, <command>mysqldump
- <option role="mysqldump">--compact</option> </command> neither set nor retrieved
- the value of <literal role="sysvar">sql_mode</literal>.
+ <option role="mysqldump">--compact</option> </command> neither
+ set nor retrieved the value of
+ <literal role="sysvar">sql_mode</literal>.
</para>
</message>
@@ -117453,8 +117460,8 @@
<para>
When <command>mysqldump</command> is invoked with the
- <option role="mysqldump">--routines</option> option, it now dumps the
- <literal>DEFINER</literal> value for stored routines.
+ <option role="mysqldump">--routines</option> option, it now
+ dumps the <literal>DEFINER</literal> value for stored routines.
</para>
</message>
@@ -136219,8 +136226,9 @@
<para>
Versions of <command>mysqldump</command> from MySQL 4.1 or
higher tried to use <literal>START TRANSACTION WITH CONSISTENT
- SNAPSHOT</literal> if the <option role="mysqldump">--single-transaction</option>
- and <option role="mysqldump">--master-data</option> options were
+ SNAPSHOT</literal> if the
+ <option role="mysqldump">--single-transaction</option> and
+ <option role="mysqldump">--master-data</option> options were
given, even with servers older than 4.1 that do not support
consistent snapshots.
</para>
@@ -138905,7 +138913,8 @@
<option>--skip-dump-date</option> control whether the date is
added to the comment. <option>--skip-dump-date</option>
suppresses date printing. The default is
- <option role="mysqldump">--dump-date</option> (include the date in the comment).
+ <option role="mysqldump">--dump-date</option> (include the date
+ in the comment).
</para>
</message>
Modified: trunk/refman-4.1/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-4.1/dba-mysqld-server-core.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-4.1/dba-mysqld-server-core.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 4; 1029 bytes
@@ -6719,10 +6719,11 @@
<para>
The server ID, used in replication to give each master and
slave a unique identity. This variable is set by the
- <option role="mysqld">--server-id</option> option. For each server
- participating in replication, you should pick a positive
- integer in the range from 1 to 2<superscript>32</superscript>
- − 1 to act as that server's ID.
+ <option role="mysqld">--server-id</option> option. For each
+ server participating in replication, you should pick a
+ positive integer in the range from 1 to
+ 2<superscript>32</superscript> − 1 to act as that
+ server's ID.
</para>
</listitem>
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-4.1/installing.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 4; 1415 bytes
@@ -13095,8 +13095,9 @@
<listitem>
<para>
As of MySQL 4.1, <command>mysqldump</command> has the
- <option role="mysqldump">--opt</option> and <option role="mysqldump">--quote-names</option>
- options enabled by default. You can turn these off using
+ <option role="mysqldump">--opt</option> and
+ <option role="mysqldump">--quote-names</option> options
+ enabled by default. You can turn these off using
<option role="mysqldump">--skip-opt</option> and
<option>--skip-quote-names</option>.
</para>
@@ -14844,8 +14845,9 @@
<option role="mysqldump">--opt</option> option to the
<command>mysqldump</command> commands shown here, to take
advantage of any optimizations that result in a dump file that
- is smaller and can be processed faster. (<option role="mysqldump">--opt</option>
- is enabled by default as of MySQL 4.1.)
+ is smaller and can be processed faster.
+ (<option role="mysqldump">--opt</option> is enabled by default
+ as of MySQL 4.1.)
</para>
<para>
Modified: trunk/refman-4.1/news-3.23.xml
===================================================================
--- trunk/refman-4.1/news-3.23.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-4.1/news-3.23.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 6; 1429 bytes
@@ -460,10 +460,11 @@
<command>mysqldump</command> no longer silently deletes the
binary logs when invoked with the
<option role="mysqldump">--master-data</option> or
- <option role="mysqldump">--first-slave</option> option; while this behavior was
- convenient for some users, others may suffer from it. Now you
- must explicitly ask for binary logs to be deleted by using the
- new <option role="mysqldump">--delete-master-logs</option> option.
+ <option role="mysqldump">--first-slave</option> option; while
+ this behavior was convenient for some users, others may suffer
+ from it. Now you must explicitly ask for binary logs to be
+ deleted by using the new
+ <option role="mysqldump">--delete-master-logs</option> option.
</para>
</listitem>
@@ -7800,8 +7801,8 @@
<listitem>
<para>
- Added <option role="mysqldump">--quote-names</option> option to
- <command>mysqldump</command>.
+ Added <option role="mysqldump">--quote-names</option> option
+ to <command>mysqldump</command>.
</para>
</listitem>
Modified: trunk/refman-4.1/news-4.0.xml
===================================================================
--- trunk/refman-4.1/news-4.0.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-4.1/news-4.0.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 3, Lines Added: 12, Lines Deleted: 9; 2320 bytes
@@ -1807,10 +1807,12 @@
<para>
InnoDB: Fixed a bug introduced in 4.0.21. An assertion failed
if one used <command>mysqldump</command> with the option
- <option>-l</option> or <option role="mysqldump">--opt</option>, or if one used
+ <option>-l</option> or
+ <option role="mysqldump">--opt</option>, or if one used
<literal>LOCK TABLES ... LOCAL</literal>. (Workaround in
4.0.21: use <option>--quick</option> and
- <option role="mysqldump">--single-transaction</option>. (Bug #5538)
+ <option role="mysqldump">--single-transaction</option>. (Bug
+ #5538)
</para>
</listitem>
@@ -5699,10 +5701,11 @@
<command>mysqldump</command> no longer silently deletes the
binary logs when invoked with the
<option role="mysqldump">--master-data</option> or
- <option role="mysqldump">--first-slave</option> option; while this behavior was
- convenient for some users, others may suffer from it. Now you
- must explicitly ask for binary logs to be deleted by using the
- new <option role="mysqldump">--delete-master-logs</option> option.
+ <option role="mysqldump">--first-slave</option> option; while
+ this behavior was convenient for some users, others may suffer
+ from it. Now you must explicitly ask for binary logs to be
+ deleted by using the new
+ <option role="mysqldump">--delete-master-logs</option> option.
</para>
</listitem>
@@ -8621,9 +8624,9 @@
<listitem>
<para>
- Added <option role="mysqldump">--single-transaction</option> option to
- <command>mysqldump</command>, allowing a consistent dump of
- <literal>InnoDB</literal> tables. See
+ Added <option role="mysqldump">--single-transaction</option>
+ option to <command>mysqldump</command>, allowing a consistent
+ dump of <literal>InnoDB</literal> tables. See
<xref linkend="mysqldump"/>.
</para>
</listitem>
Modified: trunk/refman-4.1/programs-client.xml
===================================================================
--- trunk/refman-4.1/programs-client.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-4.1/programs-client.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 31, Lines Added: 134, Lines Deleted: 99; 21499 bytes
@@ -5124,15 +5124,16 @@
<para>
Some <command>mysqldump</command> options are shorthand for
- groups of other options. <option role="mysqldump">--opt</option> and
- <option role="mysqldump">--compact</option> fall into this category. For example,
- use of <option role="mysqldump">--opt</option> is the same as specifying
- <option>--add-drop-table --add-locks --create-options
+ groups of other options. <option role="mysqldump">--opt</option>
+ and <option role="mysqldump">--compact</option> fall into this
+ category. For example, use of
+ <option role="mysqldump">--opt</option> is the same as
+ specifying <option>--add-drop-table --add-locks --create-options
--disable-keys --extended-insert --lock-tables --quick
--set-charset</option>. Note that as of MySQL ¤t-series;,
- all of the options that <option role="mysqldump">--opt</option> stands for also
- are on by default because <option role="mysqldump">--opt</option> is on by
- default.
+ all of the options that <option role="mysqldump">--opt</option>
+ stands for also are on by default because
+ <option role="mysqldump">--opt</option> is on by default.
</para>
<para>
@@ -5149,21 +5150,23 @@
<listitem>
<para>
- To select the effect of <option role="mysqldump">--opt</option> except for
- some features, use the <option>--skip</option> option for
- each feature. For example, to disable extended inserts and
- memory buffering, use <option>--opt --skip-extended-insert
+ To select the effect of
+ <option role="mysqldump">--opt</option> except for some
+ features, use the <option>--skip</option> option for each
+ feature. For example, to disable extended inserts and memory
+ buffering, use <option>--opt --skip-extended-insert
--skip-quick</option>. (As of MySQL ¤t-series;,
<option>--skip-extended-insert --skip-quick</option> is
- sufficient because <option role="mysqldump">--opt</option> is on by default.)
+ sufficient because <option role="mysqldump">--opt</option>
+ is on by default.)
</para>
</listitem>
<listitem>
<para>
- To reverse <option role="mysqldump">--opt</option> for all features except
- index disabling and table locking, use <option>--skip-opt
- --disable-keys --lock-tables</option>.
+ To reverse <option role="mysqldump">--opt</option> for all
+ features except index disabling and table locking, use
+ <option>--skip-opt --disable-keys --lock-tables</option>.
</para>
</listitem>
@@ -5174,7 +5177,8 @@
option, order is important because options are processed first
to last. For example, <option>--disable-keys --lock-tables
--skip-opt</option> would not have the intended effect; it is
- the same as <option role="mysqldump">--skip-opt</option> by itself.
+ the same as <option role="mysqldump">--skip-opt</option> by
+ itself.
</para>
<para>
@@ -5183,8 +5187,9 @@
a table and buffer it in memory before dumping it. Buffering in
memory can be a problem if you are dumping large tables. To dump
tables row by row, use the <option>--quick</option> option (or
- <option role="mysqldump">--opt</option>, which enables <option>--quick</option>).
- The <option role="mysqldump">--opt</option> option (and hence
+ <option role="mysqldump">--opt</option>, which enables
+ <option>--quick</option>). The
+ <option role="mysqldump">--opt</option> option (and hence
<option>--quick</option>) is enabled by default in MySQL
¤t-series;; to enable memory buffering, use
<option>--skip-quick</option>.
@@ -5194,8 +5199,9 @@
If you are using a recent version of
<command>mysqldump</command> to generate a dump to be reloaded
into a very old MySQL server, you should not use the
- <option role="mysqldump">--opt</option> or <option role="mysqldump">--extended-insert</option>
- option. Use <option role="mysqldump">--skip-opt</option> instead.
+ <option role="mysqldump">--opt</option> or
+ <option role="mysqldump">--extended-insert</option> option. Use
+ <option role="mysqldump">--skip-opt</option> instead.
</para>
<para>
@@ -5420,8 +5426,8 @@
Write additional information in the dump file such as
program version, server version, and host. This option is
enabled by default. To suppress this additional information,
- use <option role="mysqldump">--skip-comments</option>. This option was added
- in MySQL 4.0.17.
+ use <option role="mysqldump">--skip-comments</option>. This
+ option was added in MySQL 4.0.17.
</para>
</listitem>
@@ -5507,7 +5513,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--complete-insert</option>, <option>-c</option>
+ <option role="mysqldump">--complete-insert</option>,
+ <option>-c</option>
</para>
<para>
@@ -5676,10 +5683,11 @@
<para>
On a master replication server, delete the binary logs after
performing the dump operation. This option automatically
- enables <option role="mysqldump">--first-slave</option> before MySQL 4.1.8
- and enables <option role="mysqldump">--master-data</option>
- thereafter. It was added in MySQL 3.23.57 (for MySQL 3.23)
- and MySQL 4.0.13 (for MySQL 4.0).
+ enables <option role="mysqldump">--first-slave</option>
+ before MySQL 4.1.8 and enables
+ <option role="mysqldump">--master-data</option> thereafter.
+ It was added in MySQL 3.23.57 (for MySQL 3.23) and MySQL
+ 4.0.13 (for MySQL 4.0).
</para>
</listitem>
@@ -5695,7 +5703,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--disable-keys</option>, <option>-K</option>
+ <option role="mysqldump">--disable-keys</option>,
+ <option>-K</option>
</para>
<para>
@@ -5725,7 +5734,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--extended-insert</option>, <option>-e</option>
+ <option role="mysqldump">--extended-insert</option>,
+ <option>-e</option>
</para>
<para>
@@ -5797,12 +5807,14 @@
<listitem>
<para id="option_mysqldump_first-slave">
- <option role="mysqldump">--first-slave</option>, <option>-x</option>
+ <option role="mysqldump">--first-slave</option>,
+ <option>-x</option>
</para>
<para>
- Deprecated. Renamed to <option role="mysqldump">--lock-all-tables</option> in
- MySQL 4.1.8.
+ Deprecated. Renamed to
+ <option role="mysqldump">--lock-all-tables</option> in MySQL
+ 4.1.8.
</para>
</listitem>
@@ -5818,7 +5830,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--flush-logs</option>, <option>-F</option>
+ <option role="mysqldump">--flush-logs</option>,
+ <option>-F</option>
</para>
<para>
@@ -5834,8 +5847,9 @@
case, the logs are flushed only once, corresponding to the
moment that all tables are locked. If you want your dump and
the log flush to happen at exactly the same moment, you
- should use <option role="mysqldump">--flush-logs</option> together with
- either <option role="mysqldump">--lock-all-tables</option> or
+ should use <option role="mysqldump">--flush-logs</option>
+ together with either
+ <option role="mysqldump">--lock-all-tables</option> or
<option role="mysqldump">--master-data</option>.
</para>
</listitem>
@@ -5990,7 +6004,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--lock-all-tables</option>, <option>-x</option>
+ <option role="mysqldump">--lock-all-tables</option>,
+ <option>-x</option>
</para>
<para>
@@ -5998,7 +6013,8 @@
acquiring a global read lock for the duration of the whole
dump. This option automatically turns off
<option role="mysqldump">--single-transaction</option> and
- <option role="mysqldump">--lock-tables</option>. Added in MySQL 4.1.8.
+ <option role="mysqldump">--lock-tables</option>. Added in
+ MySQL 4.1.8.
</para>
</listitem>
@@ -6014,7 +6030,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--lock-tables</option>, <option>-l</option>
+ <option role="mysqldump">--lock-tables</option>,
+ <option>-l</option>
</para>
<para>
@@ -6023,23 +6040,24 @@
inserts in the case of <literal>MyISAM</literal> tables. For
transactional tables such as <literal>InnoDB</literal> and
<literal>BDB</literal>,
- <option role="mysqldump">--single-transaction</option> is a much better
- option, because it does not need to lock the tables at all.
+ <option role="mysqldump">--single-transaction</option> is a
+ much better option, because it does not need to lock the
+ tables at all.
</para>
<para>
Please note that when dumping multiple databases,
- <option role="mysqldump">--lock-tables</option> locks tables for each
- database separately. Therefore, this option does not
- guarantee that the tables in the dump file are logically
+ <option role="mysqldump">--lock-tables</option> locks tables
+ for each database separately. Therefore, this option does
+ not guarantee that the tables in the dump file are logically
consistent between databases. Tables in different databases
may be dumped in completely different states.
</para>
<para>
This option has no effect for output data files produced by
- using the <option role="mysqldump">--tab</option> option. See the description
- for that option.
+ using the <option role="mysqldump">--tab</option> option.
+ See the description for that option.
</para>
</listitem>
@@ -6088,13 +6106,17 @@
<para>
The <option role="mysqldump">--master-data</option> option
- automatically turns off <option role="mysqldump">--lock-tables</option>. It
- also turns on <option role="mysqldump">--lock-all-tables</option>, unless
- <option role="mysqldump">--single-transaction</option> also is specified, in
- which case, a global read lock is acquired only for a short
- time at the beginning of the dump (see the description for
- <option role="mysqldump">--single-transaction</option>). In all cases, any
- action on logs happens at the exact moment of the dump.
+ automatically turns off
+ <option role="mysqldump">--lock-tables</option>. It also
+ turns on
+ <option role="mysqldump">--lock-all-tables</option>, unless
+ <option role="mysqldump">--single-transaction</option> also
+ is specified, in which case, a global read lock is acquired
+ only for a short time at the beginning of the dump (see the
+ description for
+ <option role="mysqldump">--single-transaction</option>). In
+ all cases, any action on logs happens at the exact moment of
+ the dump.
</para>
<para>
@@ -6215,7 +6237,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--no-create-db</option>, <option>-n</option>
+ <option role="mysqldump">--no-create-db</option>,
+ <option>-n</option>
</para>
<para>
@@ -6238,7 +6261,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--no-create-info</option>, <option>-t</option>
+ <option role="mysqldump">--no-create-info</option>,
+ <option>-t</option>
</para>
<para>
@@ -6259,7 +6283,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--no-data</option>, <option>-d</option>
+ <option role="mysqldump">--no-data</option>,
+ <option>-d</option>
</para>
<para>
@@ -6295,11 +6320,12 @@
</para>
<para>
- <emphasis>As of MySQL 4.1, <option role="mysqldump">--opt</option> is enabled
- by default. Use <option role="mysqldump">--skip-opt</option> to disable
- it.</emphasis> See the discussion at the beginning of this
- section for information about selectively enabling or
- disabling certain of the options affected by
+ <emphasis>As of MySQL 4.1,
+ <option role="mysqldump">--opt</option> is enabled by
+ default. Use <option role="mysqldump">--skip-opt</option> to
+ disable it.</emphasis> See the discussion at the beginning
+ of this section for information about selectively enabling
+ or disabling certain of the options affected by
<option role="mysqldump">--opt</option>.
</para>
</listitem>
@@ -6466,7 +6492,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--quote-names</option>, <option>-Q</option>
+ <option role="mysqldump">--quote-names</option>,
+ <option>-Q</option>
</para>
<para>
@@ -6475,11 +6502,12 @@
<literal role="sqlmode">ANSI_QUOTES</literal> SQL mode is
enabled, names are quoted within
<quote><literal>"</literal></quote> characters. As of MySQL
- 4.1.1, <option role="mysqldump">--quote-names</option> is enabled by default.
- It can be disabled with <option>--skip-quote-names</option>,
- but this option should be given after any option such as
- <option role="mysqldump">--compatible</option> that may enable
- <option role="mysqldump">--quote-names</option>.
+ 4.1.1, <option role="mysqldump">--quote-names</option> is
+ enabled by default. It can be disabled with
+ <option>--skip-quote-names</option>, but this option should
+ be given after any option such as
+ <option role="mysqldump">--compatible</option> that may
+ enable <option role="mysqldump">--quote-names</option>.
</para>
</listitem>
@@ -6571,19 +6599,22 @@
</para>
<para>
- The <option role="mysqldump">--single-transaction</option> option was added
- in MySQL 4.0.2. This option is mutually exclusive with the
- <option role="mysqldump">--lock-tables</option> option, because
- <literal role="stmt">LOCK TABLES</literal> causes any
- pending transactions to be committed implicitly.
+ The <option role="mysqldump">--single-transaction</option>
+ option was added in MySQL 4.0.2. This option is mutually
+ exclusive with the
+ <option role="mysqldump">--lock-tables</option> option,
+ because <literal role="stmt">LOCK TABLES</literal> causes
+ any pending transactions to be committed implicitly.
</para>
<para>
- While a <option role="mysqldump">--single-transaction</option> dump is in
- process, to ensure a valid dump file (correct table contents
- and binary log position), no other connection should use the
- following statements: <literal role="stmt">ALTER
- TABLE</literal>, <literal role="stmt">DROP TABLE</literal>,
+ While a
+ <option role="mysqldump">--single-transaction</option> dump
+ is in process, to ensure a valid dump file (correct table
+ contents and binary log position), no other connection
+ should use the following statements:
+ <literal role="stmt">ALTER TABLE</literal>,
+ <literal role="stmt">DROP TABLE</literal>,
<literal role="stmt">RENAME TABLE</literal>,
<literal role="stmt" condition="truncate">TRUNCATE
TABLE</literal>. A consistent read is not isolated from
@@ -6646,7 +6677,8 @@
</para>
<para>
- See the description for the <option role="mysqldump">--opt</option> option.
+ See the description for the
+ <option role="mysqldump">--opt</option> option.
</para>
</listitem>
@@ -6924,9 +6956,10 @@
<para>
The initial size of the buffer for client/server
communication. When creating multiple-row-insert statements
- (as with option <option role="mysqldump">--extended-insert</option> or
- <option role="mysqldump">--opt</option>), <command>mysqldump</command>
- creates rows up to
+ (as with option
+ <option role="mysqldump">--extended-insert</option> or
+ <option role="mysqldump">--opt</option>),
+ <command>mysqldump</command> creates rows up to
<literal role="sysvar">net_buffer_length</literal> length.
If you increase this variable, you should also ensure that
the <literal role="sysvar">net_buffer_length</literal>
@@ -7044,11 +7077,11 @@
<para>
The <option role="mysqldump">--master-data</option> and
- <option role="mysqldump">--single-transaction</option> options can be used
- simultaneously as of MySQL 4.1.8, which provides a convenient
- way to make an online backup suitable for point-in-time recovery
- if tables are stored using the <literal>InnoDB</literal> storage
- engine.
+ <option role="mysqldump">--single-transaction</option> options
+ can be used simultaneously as of MySQL 4.1.8, which provides a
+ convenient way to make an online backup suitable for
+ point-in-time recovery if tables are stored using the
+ <literal>InnoDB</literal> storage engine.
</para>
<para>
@@ -7434,8 +7467,8 @@
</para>
<para>
- See the description for the <option role="mysqldump">--replace</option>
- option.
+ See the description for the
+ <option role="mysqldump">--replace</option> option.
</para>
</listitem>
@@ -7532,7 +7565,8 @@
<secondary>mysqlimport</secondary>
</indexterm>
- <option role="mysqldump">--lock-tables</option>, <option>-l</option>
+ <option role="mysqldump">--lock-tables</option>,
+ <option>-l</option>
</para>
<para>
@@ -7678,20 +7712,21 @@
<secondary>mysqlimport</secondary>
</indexterm>
- <option role="mysqldump">--replace</option>, <option>-r</option>
+ <option role="mysqldump">--replace</option>,
+ <option>-r</option>
</para>
<para>
- The <option role="mysqldump">--replace</option> and <option>--ignore</option>
- options control handling of input rows that duplicate
- existing rows on unique key values. If you specify
- <option role="mysqldump">--replace</option>, new rows replace existing rows
- that have the same unique key value. If you specify
- <option>--ignore</option>, input rows that duplicate an
- existing row on a unique key value are skipped. If you do
- not specify either option, an error occurs when a duplicate
- key value is found, and the rest of the text file is
- ignored.
+ The <option role="mysqldump">--replace</option> and
+ <option>--ignore</option> options control handling of input
+ rows that duplicate existing rows on unique key values. If
+ you specify <option role="mysqldump">--replace</option>, new
+ rows replace existing rows that have the same unique key
+ value. If you specify <option>--ignore</option>, input rows
+ that duplicate an existing row on a unique key value are
+ skipped. If you do not specify either option, an error
+ occurs when a duplicate key value is found, and the rest of
+ the text file is ignored.
</para>
</listitem>
Modified: trunk/refman-4.1/replication-options-core.xml
===================================================================
--- trunk/refman-4.1/replication-options-core.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-4.1/replication-options-core.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 6; 1692 bytes
@@ -31,9 +31,10 @@
<secondary>server-id option</secondary>
</indexterm>
- Of particular importance is the <option role="mysqld">--server-id</option> option,
- which is common to both master and slave relication servers, and is
- used in replication to enable master and slave servers to identify
+ Of particular importance is the
+ <option role="mysqld">--server-id</option> option, which is common
+ to both master and slave relication servers, and is used in
+ replication to enable master and slave servers to identify
themselves uniquely. This option was added in MySQL 3.23.26. For
additional information, see
<xref linkend="replication-options-master"/>, and
@@ -42,9 +43,9 @@
<para>
On the master and each slave, you <emphasis>must</emphasis> use the
- <option role="mysqld">--server-id</option> option to establish a unique
- replication ID. For each server participating in replication, you
- should pick a positive integer in the range from 1 to
+ <option role="mysqld">--server-id</option> option to establish a
+ unique replication ID. For each server participating in replication,
+ you should pick a positive integer in the range from 1 to
2<superscript>32</superscript> −, and each ID must be
different from every other ID in use by any other replication master
or slave. Example: <literal>server-id=3</literal>.
Modified: trunk/refman-4.1/se-innodb-core.xml
===================================================================
--- trunk/refman-4.1/se-innodb-core.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-4.1/se-innodb-core.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1507 bytes
@@ -3616,9 +3616,9 @@
corruption becomes easier. Also, because the format is simpler,
the chance for serious data corruption is smaller.
<command>mysqldump</command> also has a
- <option role="mysqldump">--single-transaction</option> option that you can use to
- make a consistent snapshot without locking out other clients. See
- <xref linkend="backup-policy"/>.
+ <option role="mysqldump">--single-transaction</option> option that
+ you can use to make a consistent snapshot without locking out
+ other clients. See <xref linkend="backup-policy"/>.
</para>
<para>
@@ -5670,9 +5670,9 @@
<para>
If you use the <command>mysqldump</command> option
- <option role="mysqldump">--opt</option>, you get dump files that are fast to
- import into an <literal>InnoDB</literal> table, even without
- wrapping them with the
+ <option role="mysqldump">--opt</option>, you get dump files
+ that are fast to import into an <literal>InnoDB</literal>
+ table, even without wrapping them with the
<literal role="stmt" condition="commit">SET
autocommit</literal> and <literal role="stmt">COMMIT</literal>
statements.
Modified: trunk/refman-5.0/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.0/dba-mysqld-server-core.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-5.0/dba-mysqld-server-core.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 4; 1029 bytes
@@ -7563,10 +7563,11 @@
<para>
The server ID, used in replication to give each master and
slave a unique identity. This variable is set by the
- <option role="mysqld">--server-id</option> option. For each server
- participating in replication, you should pick a positive
- integer in the range from 1 to 2<superscript>32</superscript>
- − 1 to act as that server's ID.
+ <option role="mysqld">--server-id</option> option. For each
+ server participating in replication, you should pick a
+ positive integer in the range from 1 to
+ 2<superscript>32</superscript> − 1 to act as that
+ server's ID.
</para>
</listitem>
Modified: trunk/refman-5.0/mysql-cluster-management.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-management.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-5.0/mysql-cluster-management.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 908 bytes
@@ -1830,8 +1830,8 @@
<row>
<entry><option>--append</option></entry>
<entry><emphasis>None</emphasis></entry>
- <entry>When used with <option role="mysqldump">--tab</option>, causes the data to be appended to
- existing files of the same name</entry>
+ <entry>When used with <option role="mysqldump">--tab</option>, causes the data
+ to be appended to existing files of the same name</entry>
<entry>[N/A]</entry>
</row>
</tbody>
Modified: trunk/refman-5.0/programs-client-core.xml
===================================================================
--- trunk/refman-5.0/programs-client-core.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-5.0/programs-client-core.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 34, Lines Added: 129, Lines Deleted: 94; 21565 bytes
@@ -5342,14 +5342,16 @@
<para>
Some <command>mysqldump</command> options are shorthand for
- groups of other options. <option role="mysqldump">--opt</option> and
- <option role="mysqldump">--compact</option> fall into this category. For example,
- use of <option role="mysqldump">--opt</option> is the same as specifying
- <option>--add-drop-table --add-locks --create-options
+ groups of other options. <option role="mysqldump">--opt</option>
+ and <option role="mysqldump">--compact</option> fall into this
+ category. For example, use of
+ <option role="mysqldump">--opt</option> is the same as
+ specifying <option>--add-drop-table --add-locks --create-options
--disable-keys --extended-insert --lock-tables --quick
--set-charset</option>. Note that all of the options that
- <option role="mysqldump">--opt</option> stands for also are on by default because
- <option role="mysqldump">--opt</option> is on by default.
+ <option role="mysqldump">--opt</option> stands for also are on
+ by default because <option role="mysqldump">--opt</option> is on
+ by default.
</para>
<para>
@@ -5366,21 +5368,23 @@
<listitem>
<para>
- To select the effect of <option role="mysqldump">--opt</option> except for
- some features, use the <option>--skip</option> option for
- each feature. For example, to disable extended inserts and
- memory buffering, use <option>--opt --skip-extended-insert
+ To select the effect of
+ <option role="mysqldump">--opt</option> except for some
+ features, use the <option>--skip</option> option for each
+ feature. For example, to disable extended inserts and memory
+ buffering, use <option>--opt --skip-extended-insert
--skip-quick</option>. (As of MySQL ¤t-series;,
<option>--skip-extended-insert --skip-quick</option> is
- sufficient because <option role="mysqldump">--opt</option> is on by default.)
+ sufficient because <option role="mysqldump">--opt</option>
+ is on by default.)
</para>
</listitem>
<listitem>
<para>
- To reverse <option role="mysqldump">--opt</option> for all features except
- index disabling and table locking, use <option>--skip-opt
- --disable-keys --lock-tables</option>.
+ To reverse <option role="mysqldump">--opt</option> for all
+ features except index disabling and table locking, use
+ <option>--skip-opt --disable-keys --lock-tables</option>.
</para>
</listitem>
@@ -5391,7 +5395,8 @@
option, order is important because options are processed first
to last. For example, <option>--disable-keys --lock-tables
--skip-opt</option> would not have the intended effect; it is
- the same as <option role="mysqldump">--skip-opt</option> by itself.
+ the same as <option role="mysqldump">--skip-opt</option> by
+ itself.
</para>
<para>
@@ -5400,8 +5405,9 @@
a table and buffer it in memory before dumping it. Buffering in
memory can be a problem if you are dumping large tables. To dump
tables row by row, use the <option>--quick</option> option (or
- <option role="mysqldump">--opt</option>, which enables <option>--quick</option>).
- The <option role="mysqldump">--opt</option> option (and hence
+ <option role="mysqldump">--opt</option>, which enables
+ <option>--quick</option>). The
+ <option role="mysqldump">--opt</option> option (and hence
<option>--quick</option>) is enabled by default in MySQL
¤t-series;; to enable memory buffering, use
<option>--skip-quick</option>.
@@ -5411,8 +5417,9 @@
If you are using a recent version of
<command>mysqldump</command> to generate a dump to be reloaded
into a very old MySQL server, you should not use the
- <option role="mysqldump">--opt</option> or <option role="mysqldump">--extended-insert</option>
- option. Use <option role="mysqldump">--skip-opt</option> instead.
+ <option role="mysqldump">--opt</option> or
+ <option role="mysqldump">--extended-insert</option> option. Use
+ <option role="mysqldump">--skip-opt</option> instead.
</para>
<para>
@@ -5675,8 +5682,8 @@
tables and this option suppressed the removal of those
temporary tables. As a workaround, use
<option role="mysqldump">--compact</option> with the
- <option role="mysqldump">--add-drop-table</option> option and then manually
- adjust the dump file.
+ <option role="mysqldump">--add-drop-table</option> option
+ and then manually adjust the dump file.
</para>
</note>
</listitem>
@@ -5737,7 +5744,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--complete-insert</option>, <option>-c</option>
+ <option role="mysqldump">--complete-insert</option>,
+ <option>-c</option>
</para>
<para>
@@ -5888,8 +5896,8 @@
<para>
This option has no effect for output data files produced by
- using the <option role="mysqldump">--tab</option> option. See the description
- for that option.
+ using the <option role="mysqldump">--tab</option> option.
+ See the description for that option.
</para>
</listitem>
@@ -5948,7 +5956,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--disable-keys</option>, <option>-K</option>
+ <option role="mysqldump">--disable-keys</option>,
+ <option>-K</option>
</para>
<para>
@@ -5990,9 +5999,10 @@
<option role="mysqldump">--dump-date</option> and
<option>--skip-dump-date</option> control whether the date
is added to the comment. The default is
- <option role="mysqldump">--dump-date</option> (include the date in the
- comment). <option>--skip-dump-date</option> suppresses date
- printing. This option was added in MySQL 5.0.52.
+ <option role="mysqldump">--dump-date</option> (include the
+ date in the comment). <option>--skip-dump-date</option>
+ suppresses date printing. This option was added in MySQL
+ 5.0.52.
</para>
</listitem>
@@ -6008,7 +6018,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--extended-insert</option>, <option>-e</option>
+ <option role="mysqldump">--extended-insert</option>,
+ <option>-e</option>
</para>
<para>
@@ -6090,7 +6101,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--first-slave</option>, <option>-x</option>
+ <option role="mysqldump">--first-slave</option>,
+ <option>-x</option>
</para>
<para>
@@ -6111,7 +6123,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--flush-logs</option>, <option>-F</option>
+ <option role="mysqldump">--flush-logs</option>,
+ <option>-F</option>
</para>
<para>
@@ -6127,8 +6140,9 @@
case, the logs are flushed only once, corresponding to the
moment that all tables are locked. If you want your dump and
the log flush to happen at exactly the same moment, you
- should use <option role="mysqldump">--flush-logs</option> together with
- either <option role="mysqldump">--lock-all-tables</option> or
+ should use <option role="mysqldump">--flush-logs</option>
+ together with either
+ <option role="mysqldump">--lock-all-tables</option> or
<option role="mysqldump">--master-data</option>.
</para>
</listitem>
@@ -6319,7 +6333,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--lock-all-tables</option>, <option>-x</option>
+ <option role="mysqldump">--lock-all-tables</option>,
+ <option>-x</option>
</para>
<para>
@@ -6343,7 +6358,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--lock-tables</option>, <option>-l</option>
+ <option role="mysqldump">--lock-tables</option>,
+ <option>-l</option>
</para>
<para>
@@ -6352,15 +6368,16 @@
inserts in the case of <literal>MyISAM</literal> tables. For
transactional tables such as <literal>InnoDB</literal> and
<literal>BDB</literal>,
- <option role="mysqldump">--single-transaction</option> is a much better
- option, because it does not need to lock the tables at all.
+ <option role="mysqldump">--single-transaction</option> is a
+ much better option, because it does not need to lock the
+ tables at all.
</para>
<para>
Please note that when dumping multiple databases,
- <option role="mysqldump">--lock-tables</option> locks tables for each
- database separately. Therefore, this option does not
- guarantee that the tables in the dump file are logically
+ <option role="mysqldump">--lock-tables</option> locks tables
+ for each database separately. Therefore, this option does
+ not guarantee that the tables in the dump file are logically
consistent between databases. Tables in different databases
may be dumped in completely different states.
</para>
@@ -6430,13 +6447,17 @@
<para>
The <option role="mysqldump">--master-data</option> option
- automatically turns off <option role="mysqldump">--lock-tables</option>. It
- also turns on <option role="mysqldump">--lock-all-tables</option>, unless
- <option role="mysqldump">--single-transaction</option> also is specified, in
- which case, a global read lock is acquired only for a short
- time at the beginning of the dump (see the description for
- <option role="mysqldump">--single-transaction</option>). In all cases, any
- action on logs happens at the exact moment of the dump.
+ automatically turns off
+ <option role="mysqldump">--lock-tables</option>. It also
+ turns on
+ <option role="mysqldump">--lock-all-tables</option>, unless
+ <option role="mysqldump">--single-transaction</option> also
+ is specified, in which case, a global read lock is acquired
+ only for a short time at the beginning of the dump (see the
+ description for
+ <option role="mysqldump">--single-transaction</option>). In
+ all cases, any action on logs happens at the exact moment of
+ the dump.
</para>
<para>
@@ -6557,7 +6578,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--no-create-db</option>, <option>-n</option>
+ <option role="mysqldump">--no-create-db</option>,
+ <option>-n</option>
</para>
<para>
@@ -6580,7 +6602,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--no-create-info</option>, <option>-t</option>
+ <option role="mysqldump">--no-create-info</option>,
+ <option>-t</option>
</para>
<para>
@@ -6601,7 +6624,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--no-data</option>, <option>-d</option>
+ <option role="mysqldump">--no-data</option>,
+ <option>-d</option>
</para>
<para>
@@ -6637,8 +6661,9 @@
</para>
<para>
- <emphasis>The <option role="mysqldump">--opt</option> option is enabled by
- default. Use <option role="mysqldump">--skip-opt</option> to disable
+ <emphasis>The <option role="mysqldump">--opt</option> option
+ is enabled by default. Use
+ <option role="mysqldump">--skip-opt</option> to disable
it.</emphasis> See the discussion at the beginning of this
section for information about selectively enabling or
disabling certain of the options affected by
@@ -6806,7 +6831,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--quote-names</option>, <option>-Q</option>
+ <option role="mysqldump">--quote-names</option>,
+ <option>-Q</option>
</para>
<para>
@@ -6818,8 +6844,8 @@
is enabled by default. It can be disabled with
<option>--skip-quote-names</option>, but this option should
be given after any option such as
- <option role="mysqldump">--compatible</option> that may enable
- <option role="mysqldump">--quote-names</option>.
+ <option role="mysqldump">--compatible</option> that may
+ enable <option role="mysqldump">--quote-names</option>.
</para>
</listitem>
@@ -6862,7 +6888,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--routines</option>, <option>-R</option>
+ <option role="mysqldump">--routines</option>,
+ <option>-R</option>
</para>
<para>
@@ -6883,9 +6910,9 @@
<para>
If you require routines to be re-created with their original
timestamp attributes, do not use
- <option role="mysqldump">--routines</option>. Instead, dump and reload the
- contents of the <literal>mysql.proc</literal> table
- directly, using a MySQL account that has appropriate
+ <option role="mysqldump">--routines</option>. Instead, dump
+ and reload the contents of the <literal>mysql.proc</literal>
+ table directly, using a MySQL account that has appropriate
privileges for the <literal>mysql</literal> database.
</para>
@@ -6962,19 +6989,22 @@
</para>
<para>
- The <option role="mysqldump">--single-transaction</option> option and the
- <option role="mysqldump">--lock-tables</option> option are mutually
- exclusive, because <literal role="stmt">LOCK
+ The <option role="mysqldump">--single-transaction</option>
+ option and the
+ <option role="mysqldump">--lock-tables</option> option are
+ mutually exclusive, because <literal role="stmt">LOCK
TABLES</literal> causes any pending transactions to be
committed implicitly.
</para>
<para>
- While a <option role="mysqldump">--single-transaction</option> dump is in
- process, to ensure a valid dump file (correct table contents
- and binary log position), no other connection should use the
- following statements: <literal role="stmt">ALTER
- TABLE</literal>, <literal role="stmt">DROP TABLE</literal>,
+ While a
+ <option role="mysqldump">--single-transaction</option> dump
+ is in process, to ensure a valid dump file (correct table
+ contents and binary log position), no other connection
+ should use the following statements:
+ <literal role="stmt">ALTER TABLE</literal>,
+ <literal role="stmt">DROP TABLE</literal>,
<literal role="stmt">RENAME TABLE</literal>,
<literal role="stmt" condition="truncate">TRUNCATE
TABLE</literal>. A consistent read is not isolated from
@@ -7037,7 +7067,8 @@
</para>
<para>
- See the description for the <option role="mysqldump">--opt</option> option.
+ See the description for the
+ <option role="mysqldump">--opt</option> option.
</para>
</listitem>
@@ -7215,11 +7246,11 @@
option, <literal role="type">TIMESTAMP</literal> columns are
dumped and reloaded in the time zones local to the source
and destination servers, which can cause the values to
- change. <option role="mysqldump">--tz-utc</option> also protects against
- changes due to daylight saving time.
- <option role="mysqldump">--tz-utc</option> is enabled by default. To disable
- it, use <option>--skip-tz-utc</option>. This option was
- added in MySQL 5.0.15.
+ change. <option role="mysqldump">--tz-utc</option> also
+ protects against changes due to daylight saving time.
+ <option role="mysqldump">--tz-utc</option> is enabled by
+ default. To disable it, use <option>--skip-tz-utc</option>.
+ This option was added in MySQL 5.0.15.
</para>
</listitem>
@@ -7460,9 +7491,10 @@
<para>
The initial size of the buffer for client/server
communication. When creating multiple-row-insert statements
- (as with option <option role="mysqldump">--extended-insert</option> or
- <option role="mysqldump">--opt</option>), <command>mysqldump</command>
- creates rows up to
+ (as with option
+ <option role="mysqldump">--extended-insert</option> or
+ <option role="mysqldump">--opt</option>),
+ <command>mysqldump</command> creates rows up to
<literal role="sysvar">net_buffer_length</literal> length.
If you increase this variable, you should also ensure that
the <literal role="sysvar">net_buffer_length</literal>
@@ -7578,10 +7610,11 @@
<para>
The <option role="mysqldump">--master-data</option> and
- <option role="mysqldump">--single-transaction</option> options can be used
- simultaneously, which provides a convenient way to make an
- online backup suitable for point-in-time recovery if tables are
- stored using the <literal>InnoDB</literal> storage engine.
+ <option role="mysqldump">--single-transaction</option> options
+ can be used simultaneously, which provides a convenient way to
+ make an online backup suitable for point-in-time recovery if
+ tables are stored using the <literal>InnoDB</literal> storage
+ engine.
</para>
<para>
@@ -7992,8 +8025,8 @@
</para>
<para>
- See the description for the <option role="mysqldump">--replace</option>
- option.
+ See the description for the
+ <option role="mysqldump">--replace</option> option.
</para>
</listitem>
@@ -8090,7 +8123,8 @@
<secondary>mysqlimport</secondary>
</indexterm>
- <option role="mysqldump">--lock-tables</option>, <option>-l</option>
+ <option role="mysqldump">--lock-tables</option>,
+ <option>-l</option>
</para>
<para>
@@ -8235,20 +8269,21 @@
<secondary>mysqlimport</secondary>
</indexterm>
- <option role="mysqldump">--replace</option>, <option>-r</option>
+ <option role="mysqldump">--replace</option>,
+ <option>-r</option>
</para>
<para>
- The <option role="mysqldump">--replace</option> and <option>--ignore</option>
- options control handling of input rows that duplicate
- existing rows on unique key values. If you specify
- <option role="mysqldump">--replace</option>, new rows replace existing rows
- that have the same unique key value. If you specify
- <option>--ignore</option>, input rows that duplicate an
- existing row on a unique key value are skipped. If you do
- not specify either option, an error occurs when a duplicate
- key value is found, and the rest of the text file is
- ignored.
+ The <option role="mysqldump">--replace</option> and
+ <option>--ignore</option> options control handling of input
+ rows that duplicate existing rows on unique key values. If
+ you specify <option role="mysqldump">--replace</option>, new
+ rows replace existing rows that have the same unique key
+ value. If you specify <option>--ignore</option>, input rows
+ that duplicate an existing row on a unique key value are
+ skipped. If you do not specify either option, an error
+ occurs when a duplicate key value is found, and the rest of
+ the text file is ignored.
</para>
</listitem>
Modified: trunk/refman-5.0/replication-options-core.xml
===================================================================
--- trunk/refman-5.0/replication-options-core.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-5.0/replication-options-core.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 6; 1697 bytes
@@ -31,9 +31,10 @@
<secondary>server-id option</secondary>
</indexterm>
- Of particular importance is the <option role="mysqld">--server-id</option> option,
- which is common to both master and slave relication servers, and is
- used in replication to enable master and slave servers to identify
+ Of particular importance is the
+ <option role="mysqld">--server-id</option> option, which is common
+ to both master and slave relication servers, and is used in
+ replication to enable master and slave servers to identify
themselves uniquely. For additional information, see
<xref linkend="replication-options-master"/>, and
<xref linkend="replication-options-slave"/>.
@@ -41,9 +42,9 @@
<para>
On the master and each slave, you <emphasis>must</emphasis> use the
- <option role="mysqld">--server-id</option> option to establish a unique
- replication ID. For each server participating in replication, you
- should pick a positive integer in the range from 1 to
+ <option role="mysqld">--server-id</option> option to establish a
+ unique replication ID. For each server participating in replication,
+ you should pick a positive integer in the range from 1 to
2<superscript>32</superscript> −, and each ID must be
different from every other ID in use by any other replication master
or slave. Example: <literal>server-id=3</literal>.
Modified: trunk/refman-5.0/se-innodb-core.xml
===================================================================
--- trunk/refman-5.0/se-innodb-core.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-5.0/se-innodb-core.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1507 bytes
@@ -3728,9 +3728,9 @@
corruption becomes easier. Also, because the format is simpler,
the chance for serious data corruption is smaller.
<command>mysqldump</command> also has a
- <option role="mysqldump">--single-transaction</option> option that you can use to
- make a consistent snapshot without locking out other clients. See
- <xref linkend="backup-policy"/>.
+ <option role="mysqldump">--single-transaction</option> option that
+ you can use to make a consistent snapshot without locking out
+ other clients. See <xref linkend="backup-policy"/>.
</para>
<para>
@@ -5757,9 +5757,9 @@
<para>
If you use the <command>mysqldump</command> option
- <option role="mysqldump">--opt</option>, you get dump files that are fast to
- import into an <literal>InnoDB</literal> table, even without
- wrapping them with the
+ <option role="mysqldump">--opt</option>, you get dump files
+ that are fast to import into an <literal>InnoDB</literal>
+ table, even without wrapping them with the
<literal role="stmt" condition="commit">SET
autocommit</literal> and <literal role="stmt">COMMIT</literal>
statements.
Modified: trunk/refman-5.1/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.1/dba-mysqld-server-core.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-5.1/dba-mysqld-server-core.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 4; 1029 bytes
@@ -8088,10 +8088,11 @@
<para>
The server ID, used in replication to give each master and
slave a unique identity. This variable is set by the
- <option role="mysqld">--server-id</option> option. For each server
- participating in replication, you should pick a positive
- integer in the range from 1 to 2<superscript>32</superscript>
- − 1 to act as that server's ID.
+ <option role="mysqld">--server-id</option> option. For each
+ server participating in replication, you should pick a
+ positive integer in the range from 1 to
+ 2<superscript>32</superscript> − 1 to act as that
+ server's ID.
</para>
</listitem>
Modified: trunk/refman-5.1/events.xml
===================================================================
--- trunk/refman-5.1/events.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-5.1/events.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 1186 bytes
@@ -444,11 +444,11 @@
<para>
To enable the Event Scheduler, restart the server without the
- <option role="mysqld">--event-scheduler=DISABLED</option> command-line option,
- or after removing or commenting out the line containing
- <option role="mysqld">event-scheduler=DISABLED</option> in the server
- configuration file, as appropriate. Alternatively, you can use
- <literal>ON</literal> (or <literal>1</literal>) or
+ <option role="mysqld">--event-scheduler=DISABLED</option>
+ command-line option, or after removing or commenting out the line
+ containing <option role="mysqld">event-scheduler=DISABLED</option>
+ in the server configuration file, as appropriate. Alternatively,
+ you can use <literal>ON</literal> (or <literal>1</literal>) or
<literal>OFF</literal> (or <literal>0</literal>) in place of the
<literal>DISABLED</literal> value when starting the server.
</para>
Modified: trunk/refman-5.1/installing-core.xml
===================================================================
--- trunk/refman-5.1/installing-core.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-5.1/installing-core.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 933 bytes
@@ -14542,9 +14542,9 @@
<command>mysqldump</command> (such as when using the
<option>--all-databases</option> option). Instead, you
should run <command>mysqldump
- <option role="mysqldump">--routines</option></command> prior to
- performing the downgrade and run the stored routines DDL
- statements following the downgrade.
+ <option role="mysqldump">--routines</option></command>
+ prior to performing the downgrade and run the stored
+ routines DDL statements following the downgrade.
</para>
</formalpara>
Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-5.1/introduction.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 703 bytes
@@ -610,8 +610,8 @@
<para>
The <command>mysqldump</command> utility now supports an
option for dumping tablespaces. Use <option>-Y</option> or
- <option role="mysqldump">--all-tablespaces</option> to enable this
- functionality.
+ <option role="mysqldump">--all-tablespaces</option> to
+ enable this functionality.
</para>
</formalpara>
Modified: trunk/refman-5.1/mysql-cluster-management.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-management.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-5.1/mysql-cluster-management.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 908 bytes
@@ -2171,8 +2171,8 @@
<row>
<entry><option>--append</option></entry>
<entry><emphasis>None</emphasis></entry>
- <entry>When used with <option role="mysqldump">--tab</option>, causes the data to be appended to
- existing files of the same name</entry>
+ <entry>When used with <option role="mysqldump">--tab</option>, causes the data
+ to be appended to existing files of the same name</entry>
<entry>[N/A]</entry>
</row>
</tbody>
Modified: trunk/refman-5.1/programs-client-core.xml
===================================================================
--- trunk/refman-5.1/programs-client-core.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-5.1/programs-client-core.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 37, Lines Added: 133, Lines Deleted: 97; 22271 bytes
@@ -5548,15 +5548,16 @@
<para>
Some <command>mysqldump</command> options are shorthand for
- groups of other options. <option role="mysqldump">--opt</option> and
- <option role="mysqldump">--compact</option> fall into this category. For example,
- use of <option role="mysqldump">--opt</option> is the same as specifying
- <option>--add-drop-table --add-locks --create-options
+ groups of other options. <option role="mysqldump">--opt</option>
+ and <option role="mysqldump">--compact</option> fall into this
+ category. For example, use of
+ <option role="mysqldump">--opt</option> is the same as
+ specifying <option>--add-drop-table --add-locks --create-options
--disable-keys --extended-insert --lock-tables --quick
--set-charset</option>. Note that as of MySQL ¤t-series;,
- all of the options that <option role="mysqldump">--opt</option> stands for also
- are on by default because <option role="mysqldump">--opt</option> is on by
- default.
+ all of the options that <option role="mysqldump">--opt</option>
+ stands for also are on by default because
+ <option role="mysqldump">--opt</option> is on by default.
</para>
<para>
@@ -5573,21 +5574,23 @@
<listitem>
<para>
- To select the effect of <option role="mysqldump">--opt</option> except for
- some features, use the <option>--skip</option> option for
- each feature. For example, to disable extended inserts and
- memory buffering, use <option>--opt --skip-extended-insert
+ To select the effect of
+ <option role="mysqldump">--opt</option> except for some
+ features, use the <option>--skip</option> option for each
+ feature. For example, to disable extended inserts and memory
+ buffering, use <option>--opt --skip-extended-insert
--skip-quick</option>. (As of MySQL ¤t-series;,
<option>--skip-extended-insert --skip-quick</option> is
- sufficient because <option role="mysqldump">--opt</option> is on by default.)
+ sufficient because <option role="mysqldump">--opt</option>
+ is on by default.)
</para>
</listitem>
<listitem>
<para>
- To reverse <option role="mysqldump">--opt</option> for all features except
- index disabling and table locking, use <option>--skip-opt
- --disable-keys --lock-tables</option>.
+ To reverse <option role="mysqldump">--opt</option> for all
+ features except index disabling and table locking, use
+ <option>--skip-opt --disable-keys --lock-tables</option>.
</para>
</listitem>
@@ -5598,7 +5601,8 @@
option, order is important because options are processed first
to last. For example, <option>--disable-keys --lock-tables
--skip-opt</option> would not have the intended effect; it is
- the same as <option role="mysqldump">--skip-opt</option> by itself.
+ the same as <option role="mysqldump">--skip-opt</option> by
+ itself.
</para>
<para>
@@ -5607,8 +5611,9 @@
a table and buffer it in memory before dumping it. Buffering in
memory can be a problem if you are dumping large tables. To dump
tables row by row, use the <option>--quick</option> option (or
- <option role="mysqldump">--opt</option>, which enables <option>--quick</option>).
- The <option role="mysqldump">--opt</option> option (and hence
+ <option role="mysqldump">--opt</option>, which enables
+ <option>--quick</option>). The
+ <option role="mysqldump">--opt</option> option (and hence
<option>--quick</option>) is enabled by default in MySQL
¤t-series;; to enable memory buffering, use
<option>--skip-quick</option>.
@@ -5618,8 +5623,9 @@
If you are using a recent version of
<command>mysqldump</command> to generate a dump to be reloaded
into a very old MySQL server, you should not use the
- <option role="mysqldump">--opt</option> or <option role="mysqldump">--extended-insert</option>
- option. Use <option role="mysqldump">--skip-opt</option> instead.
+ <option role="mysqldump">--opt</option> or
+ <option role="mysqldump">--extended-insert</option> option. Use
+ <option role="mysqldump">--skip-opt</option> instead.
</para>
<note>
@@ -5762,7 +5768,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--all-tablespaces</option>, <option>-Y</option>
+ <option role="mysqldump">--all-tablespaces</option>,
+ <option>-Y</option>
</para>
<para>
@@ -5876,8 +5883,8 @@
tables and this option suppressed the removal of those
temporary tables. As a workaround, use
<option role="mysqldump">--compact</option> with the
- <option role="mysqldump">--add-drop-table</option> option and then manually
- adjust the dump file.
+ <option role="mysqldump">--add-drop-table</option> option
+ and then manually adjust the dump file.
</para>
</note>
</listitem>
@@ -5938,7 +5945,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--complete-insert</option>, <option>-c</option>
+ <option role="mysqldump">--complete-insert</option>,
+ <option>-c</option>
</para>
<para>
@@ -6110,8 +6118,8 @@
<para>
This option has no effect for output data files produced by
- using the <option role="mysqldump">--tab</option> option. See the description
- for that option.
+ using the <option role="mysqldump">--tab</option> option.
+ See the description for that option.
</para>
</listitem>
@@ -6170,7 +6178,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--disable-keys</option>, <option>-K</option>
+ <option role="mysqldump">--disable-keys</option>,
+ <option>-K</option>
</para>
<para>
@@ -6212,9 +6221,10 @@
<option role="mysqldump">--dump-date</option> and
<option>--skip-dump-date</option> control whether the date
is added to the comment. The default is
- <option role="mysqldump">--dump-date</option> (include the date in the
- comment). <option>--skip-dump-date</option> suppresses date
- printing. This option was added in MySQL 5.1.23.
+ <option role="mysqldump">--dump-date</option> (include the
+ date in the comment). <option>--skip-dump-date</option>
+ suppresses date printing. This option was added in MySQL
+ 5.1.23.
</para>
</listitem>
@@ -6230,7 +6240,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--events</option>, <option>-E</option>
+ <option role="mysqldump">--events</option>,
+ <option>-E</option>
</para>
<para>
@@ -6251,7 +6262,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--extended-insert</option>, <option>-e</option>
+ <option role="mysqldump">--extended-insert</option>,
+ <option>-e</option>
</para>
<para>
@@ -6333,7 +6345,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--first-slave</option>, <option>-x</option>
+ <option role="mysqldump">--first-slave</option>,
+ <option>-x</option>
</para>
<para>
@@ -6354,7 +6367,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--flush-logs</option>, <option>-F</option>
+ <option role="mysqldump">--flush-logs</option>,
+ <option>-F</option>
</para>
<para>
@@ -6370,8 +6384,9 @@
case, the logs are flushed only once, corresponding to the
moment that all tables are locked. If you want your dump and
the log flush to happen at exactly the same moment, you
- should use <option role="mysqldump">--flush-logs</option> together with
- either <option role="mysqldump">--lock-all-tables</option> or
+ should use <option role="mysqldump">--flush-logs</option>
+ together with either
+ <option role="mysqldump">--lock-all-tables</option> or
<option role="mysqldump">--master-data</option>.
</para>
</listitem>
@@ -6561,7 +6576,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--lock-all-tables</option>, <option>-x</option>
+ <option role="mysqldump">--lock-all-tables</option>,
+ <option>-x</option>
</para>
<para>
@@ -6585,7 +6601,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--lock-tables</option>, <option>-l</option>
+ <option role="mysqldump">--lock-tables</option>,
+ <option>-l</option>
</para>
<para>
@@ -6594,15 +6611,16 @@
inserts in the case of <literal>MyISAM</literal> tables. For
transactional tables such as <literal>InnoDB</literal> and
<literal>BDB</literal>,
- <option role="mysqldump">--single-transaction</option> is a much better
- option, because it does not need to lock the tables at all.
+ <option role="mysqldump">--single-transaction</option> is a
+ much better option, because it does not need to lock the
+ tables at all.
</para>
<para>
Please note that when dumping multiple databases,
- <option role="mysqldump">--lock-tables</option> locks tables for each
- database separately. Therefore, this option does not
- guarantee that the tables in the dump file are logically
+ <option role="mysqldump">--lock-tables</option> locks tables
+ for each database separately. Therefore, this option does
+ not guarantee that the tables in the dump file are logically
consistent between databases. Tables in different databases
may be dumped in completely different states.
</para>
@@ -6672,13 +6690,17 @@
<para>
The <option role="mysqldump">--master-data</option> option
- automatically turns off <option role="mysqldump">--lock-tables</option>. It
- also turns on <option role="mysqldump">--lock-all-tables</option>, unless
- <option role="mysqldump">--single-transaction</option> also is specified, in
- which case, a global read lock is acquired only for a short
- time at the beginning of the dump (see the description for
- <option role="mysqldump">--single-transaction</option>). In all cases, any
- action on logs happens at the exact moment of the dump.
+ automatically turns off
+ <option role="mysqldump">--lock-tables</option>. It also
+ turns on
+ <option role="mysqldump">--lock-all-tables</option>, unless
+ <option role="mysqldump">--single-transaction</option> also
+ is specified, in which case, a global read lock is acquired
+ only for a short time at the beginning of the dump (see the
+ description for
+ <option role="mysqldump">--single-transaction</option>). In
+ all cases, any action on logs happens at the exact moment of
+ the dump.
</para>
<para>
@@ -6799,7 +6821,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--no-create-db</option>, <option>-n</option>
+ <option role="mysqldump">--no-create-db</option>,
+ <option>-n</option>
</para>
<para>
@@ -6822,7 +6845,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--no-create-info</option>, <option>-t</option>
+ <option role="mysqldump">--no-create-info</option>,
+ <option>-t</option>
</para>
<para>
@@ -6843,7 +6867,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--no-data</option>, <option>-d</option>
+ <option role="mysqldump">--no-data</option>,
+ <option>-d</option>
</para>
<para>
@@ -6879,8 +6904,9 @@
</para>
<para>
- <emphasis>The <option role="mysqldump">--opt</option> option is enabled by
- default. Use <option role="mysqldump">--skip-opt</option> to disable
+ <emphasis>The <option role="mysqldump">--opt</option> option
+ is enabled by default. Use
+ <option role="mysqldump">--skip-opt</option> to disable
it.</emphasis> See the discussion at the beginning of this
section for information about selectively enabling or
disabling certain of the options affected by
@@ -7048,7 +7074,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--quote-names</option>, <option>-Q</option>
+ <option role="mysqldump">--quote-names</option>,
+ <option>-Q</option>
</para>
<para>
@@ -7060,8 +7087,8 @@
is enabled by default. It can be disabled with
<option>--skip-quote-names</option>, but this option should
be given after any option such as
- <option role="mysqldump">--compatible</option> that may enable
- <option role="mysqldump">--quote-names</option>.
+ <option role="mysqldump">--compatible</option> that may
+ enable <option role="mysqldump">--quote-names</option>.
</para>
</listitem>
@@ -7126,7 +7153,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--routines</option>, <option>-R</option>
+ <option role="mysqldump">--routines</option>,
+ <option>-R</option>
</para>
<para>
@@ -7147,9 +7175,9 @@
<para>
If you require routines to be re-created with their original
timestamp attributes, do not use
- <option role="mysqldump">--routines</option>. Instead, dump and reload the
- contents of the <literal>mysql.proc</literal> table
- directly, using a MySQL account that has appropriate
+ <option role="mysqldump">--routines</option>. Instead, dump
+ and reload the contents of the <literal>mysql.proc</literal>
+ table directly, using a MySQL account that has appropriate
privileges for the <literal>mysql</literal> database.
</para>
@@ -7225,11 +7253,13 @@
</para>
<para>
- While a <option role="mysqldump">--single-transaction</option> dump is in
- process, to ensure a valid dump file (correct table contents
- and binary log position), no other connection should use the
- following statements: <literal role="stmt">ALTER
- TABLE</literal>, <literal role="stmt">DROP TABLE</literal>,
+ While a
+ <option role="mysqldump">--single-transaction</option> dump
+ is in process, to ensure a valid dump file (correct table
+ contents and binary log position), no other connection
+ should use the following statements:
+ <literal role="stmt">ALTER TABLE</literal>,
+ <literal role="stmt">DROP TABLE</literal>,
<literal role="stmt">RENAME TABLE</literal>,
<literal role="stmt" condition="truncate">TRUNCATE
TABLE</literal>. A consistent read is not isolated from
@@ -7250,9 +7280,10 @@
</para>
<para>
- The <option role="mysqldump">--single-transaction</option> option and the
- <option role="mysqldump">--lock-tables</option> option are mutually
- exclusive, because <literal role="stmt">LOCK
+ The <option role="mysqldump">--single-transaction</option>
+ option and the
+ <option role="mysqldump">--lock-tables</option> option are
+ mutually exclusive, because <literal role="stmt">LOCK
TABLES</literal> causes any pending transactions to be
committed implicitly.
</para>
@@ -7300,7 +7331,8 @@
</para>
<para>
- See the description for the <option role="mysqldump">--opt</option> option.
+ See the description for the
+ <option role="mysqldump">--opt</option> option.
</para>
</listitem>
@@ -7477,11 +7509,11 @@
option, <literal role="type">TIMESTAMP</literal> columns are
dumped and reloaded in the time zones local to the source
and destination servers, which can cause the values to
- change. <option role="mysqldump">--tz-utc</option> also protects against
- changes due to daylight saving time.
- <option role="mysqldump">--tz-utc</option> is enabled by default. To disable
- it, use <option>--skip-tz-utc</option>. This option was
- added in MySQL 5.1.2.
+ change. <option role="mysqldump">--tz-utc</option> also
+ protects against changes due to daylight saving time.
+ <option role="mysqldump">--tz-utc</option> is enabled by
+ default. To disable it, use <option>--skip-tz-utc</option>.
+ This option was added in MySQL 5.1.2.
</para>
</listitem>
@@ -7722,9 +7754,10 @@
<para>
The initial size of the buffer for client/server
communication. When creating multiple-row-insert statements
- (as with option <option role="mysqldump">--extended-insert</option> or
- <option role="mysqldump">--opt</option>), <command>mysqldump</command>
- creates rows up to
+ (as with option
+ <option role="mysqldump">--extended-insert</option> or
+ <option role="mysqldump">--opt</option>),
+ <command>mysqldump</command> creates rows up to
<literal role="sysvar">net_buffer_length</literal> length.
If you increase this variable, you should also ensure that
the <literal role="sysvar">net_buffer_length</literal>
@@ -7834,10 +7867,11 @@
<para>
The <option role="mysqldump">--master-data</option> and
- <option role="mysqldump">--single-transaction</option> options can be used
- simultaneously, which provides a convenient way to make an
- online backup suitable for point-in-time recovery if tables are
- stored using the <literal>InnoDB</literal> storage engine.
+ <option role="mysqldump">--single-transaction</option> options
+ can be used simultaneously, which provides a convenient way to
+ make an online backup suitable for point-in-time recovery if
+ tables are stored using the <literal>InnoDB</literal> storage
+ engine.
</para>
<para>
@@ -8291,8 +8325,8 @@
</para>
<para>
- See the description for the <option role="mysqldump">--replace</option>
- option.
+ See the description for the
+ <option role="mysqldump">--replace</option> option.
</para>
</listitem>
@@ -8389,7 +8423,8 @@
<secondary>mysqlimport</secondary>
</indexterm>
- <option role="mysqldump">--lock-tables</option>, <option>-l</option>
+ <option role="mysqldump">--lock-tables</option>,
+ <option>-l</option>
</para>
<para>
@@ -8534,20 +8569,21 @@
<secondary>mysqlimport</secondary>
</indexterm>
- <option role="mysqldump">--replace</option>, <option>-r</option>
+ <option role="mysqldump">--replace</option>,
+ <option>-r</option>
</para>
<para>
- The <option role="mysqldump">--replace</option> and <option>--ignore</option>
- options control handling of input rows that duplicate
- existing rows on unique key values. If you specify
- <option role="mysqldump">--replace</option>, new rows replace existing rows
- that have the same unique key value. If you specify
- <option>--ignore</option>, input rows that duplicate an
- existing row on a unique key value are skipped. If you do
- not specify either option, an error occurs when a duplicate
- key value is found, and the rest of the text file is
- ignored.
+ The <option role="mysqldump">--replace</option> and
+ <option>--ignore</option> options control handling of input
+ rows that duplicate existing rows on unique key values. If
+ you specify <option role="mysqldump">--replace</option>, new
+ rows replace existing rows that have the same unique key
+ value. If you specify <option>--ignore</option>, input rows
+ that duplicate an existing row on a unique key value are
+ skipped. If you do not specify either option, an error
+ occurs when a duplicate key value is found, and the rest of
+ the text file is ignored.
</para>
</listitem>
Modified: trunk/refman-5.1/replication-options-core.xml
===================================================================
--- trunk/refman-5.1/replication-options-core.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-5.1/replication-options-core.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 4; 1331 bytes
@@ -31,7 +31,8 @@
<secondary>server-id option</secondary>
</indexterm>
- Of particular importance is the <option role="mysqld">--server-id</option> option.
+ Of particular importance is the
+ <option role="mysqld">--server-id</option> option.
</para>
<para condition="dynamic:optvar:item" role="5.1:mysqld:server-id"/>
@@ -46,9 +47,9 @@
<para>
On the master and each slave, you <emphasis>must</emphasis> use the
- <option role="mysqld">--server-id</option> option to establish a unique
- replication ID. For each server participating in replication, you
- should pick a positive integer in the range from 1 to
+ <option role="mysqld">--server-id</option> option to establish a
+ unique replication ID. For each server participating in replication,
+ you should pick a positive integer in the range from 1 to
2<superscript>32</superscript> −, and each ID must be
different from every other ID in use by any other replication master
or slave. Example: <literal>server-id=3</literal>.
Modified: trunk/refman-5.1/se-innodb-core.xml
===================================================================
--- trunk/refman-5.1/se-innodb-core.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-5.1/se-innodb-core.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1507 bytes
@@ -4469,9 +4469,9 @@
corruption becomes easier. Also, because the format is simpler,
the chance for serious data corruption is smaller.
<command>mysqldump</command> also has a
- <option role="mysqldump">--single-transaction</option> option that you can use to
- make a consistent snapshot without locking out other clients. See
- <xref linkend="backup-policy"/>.
+ <option role="mysqldump">--single-transaction</option> option that
+ you can use to make a consistent snapshot without locking out
+ other clients. See <xref linkend="backup-policy"/>.
</para>
<para>
@@ -6565,9 +6565,9 @@
<para>
If you use the <command>mysqldump</command> option
- <option role="mysqldump">--opt</option>, you get dump files that are fast to
- import into an <literal>InnoDB</literal> table, even without
- wrapping them with the
+ <option role="mysqldump">--opt</option>, you get dump files
+ that are fast to import into an <literal>InnoDB</literal>
+ table, even without wrapping them with the
<literal role="stmt" condition="commit">SET
autocommit</literal> and <literal role="stmt">COMMIT</literal>
statements.
Modified: trunk/refman-6.0/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-6.0/dba-mysqld-server-core.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-6.0/dba-mysqld-server-core.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 4; 1029 bytes
@@ -8403,10 +8403,11 @@
<para>
The server ID, used in replication to give each master and
slave a unique identity. This variable is set by the
- <option role="mysqld">--server-id</option> option. For each server
- participating in replication, you should pick a positive
- integer in the range from 1 to 2<superscript>32</superscript>
- − 1 to act as that server's ID.
+ <option role="mysqld">--server-id</option> option. For each
+ server participating in replication, you should pick a
+ positive integer in the range from 1 to
+ 2<superscript>32</superscript> − 1 to act as that
+ server's ID.
</para>
</listitem>
Modified: trunk/refman-6.0/events.xml
===================================================================
--- trunk/refman-6.0/events.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-6.0/events.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 1186 bytes
@@ -440,11 +440,11 @@
<para>
To enable the Event Scheduler, restart the server without the
- <option role="mysqld">--event-scheduler=DISABLED</option> command-line option,
- or after removing or commenting out the line containing
- <option role="mysqld">event-scheduler=DISABLED</option> in the server
- configuration file, as appropriate. Alternatively, you can use
- <literal>ON</literal> (or <literal>1</literal>) or
+ <option role="mysqld">--event-scheduler=DISABLED</option>
+ command-line option, or after removing or commenting out the line
+ containing <option role="mysqld">event-scheduler=DISABLED</option>
+ in the server configuration file, as appropriate. Alternatively,
+ you can use <literal>ON</literal> (or <literal>1</literal>) or
<literal>OFF</literal> (or <literal>0</literal>) in place of the
<literal>DISABLED</literal> value when starting the server.
</para>
Modified: trunk/refman-6.0/programs-client-core.xml
===================================================================
--- trunk/refman-6.0/programs-client-core.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-6.0/programs-client-core.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 36, Lines Added: 136, Lines Deleted: 98; 22413 bytes
@@ -5539,15 +5539,16 @@
<para>
Some <command>mysqldump</command> options are shorthand for
- groups of other options. <option role="mysqldump">--opt</option> and
- <option role="mysqldump">--compact</option> fall into this category. For example,
- use of <option role="mysqldump">--opt</option> is the same as specifying
- <option>--add-drop-table --add-locks --create-options
+ groups of other options. <option role="mysqldump">--opt</option>
+ and <option role="mysqldump">--compact</option> fall into this
+ category. For example, use of
+ <option role="mysqldump">--opt</option> is the same as
+ specifying <option>--add-drop-table --add-locks --create-options
--disable-keys --extended-insert --lock-tables --quick
--set-charset</option>. Note that as of MySQL ¤t-series;,
- all of the options that <option role="mysqldump">--opt</option> stands for also
- are on by default because <option role="mysqldump">--opt</option> is on by
- default.
+ all of the options that <option role="mysqldump">--opt</option>
+ stands for also are on by default because
+ <option role="mysqldump">--opt</option> is on by default.
</para>
<para>
@@ -5564,21 +5565,23 @@
<listitem>
<para>
- To select the effect of <option role="mysqldump">--opt</option> except for
- some features, use the <option>--skip</option> option for
- each feature. For example, to disable extended inserts and
- memory buffering, use <option>--opt --skip-extended-insert
+ To select the effect of
+ <option role="mysqldump">--opt</option> except for some
+ features, use the <option>--skip</option> option for each
+ feature. For example, to disable extended inserts and memory
+ buffering, use <option>--opt --skip-extended-insert
--skip-quick</option>. (As of MySQL ¤t-series;,
<option>--skip-extended-insert --skip-quick</option> is
- sufficient because <option role="mysqldump">--opt</option> is on by default.)
+ sufficient because <option role="mysqldump">--opt</option>
+ is on by default.)
</para>
</listitem>
<listitem>
<para>
- To reverse <option role="mysqldump">--opt</option> for all features except
- index disabling and table locking, use <option>--skip-opt
- --disable-keys --lock-tables</option>.
+ To reverse <option role="mysqldump">--opt</option> for all
+ features except index disabling and table locking, use
+ <option>--skip-opt --disable-keys --lock-tables</option>.
</para>
</listitem>
@@ -5589,7 +5592,8 @@
option, order is important because options are processed first
to last. For example, <option>--disable-keys --lock-tables
--skip-opt</option> would not have the intended effect; it is
- the same as <option role="mysqldump">--skip-opt</option> by itself.
+ the same as <option role="mysqldump">--skip-opt</option> by
+ itself.
</para>
<para>
@@ -5598,8 +5602,9 @@
a table and buffer it in memory before dumping it. Buffering in
memory can be a problem if you are dumping large tables. To dump
tables row by row, use the <option>--quick</option> option (or
- <option role="mysqldump">--opt</option>, which enables <option>--quick</option>).
- The <option role="mysqldump">--opt</option> option (and hence
+ <option role="mysqldump">--opt</option>, which enables
+ <option>--quick</option>). The
+ <option role="mysqldump">--opt</option> option (and hence
<option>--quick</option>) is enabled by default in MySQL
¤t-series;; to enable memory buffering, use
<option>--skip-quick</option>.
@@ -5609,8 +5614,9 @@
If you are using a recent version of
<command>mysqldump</command> to generate a dump to be reloaded
into a very old MySQL server, you should not use the
- <option role="mysqldump">--opt</option> or <option role="mysqldump">--extended-insert</option>
- option. Use <option role="mysqldump">--skip-opt</option> instead.
+ <option role="mysqldump">--opt</option> or
+ <option role="mysqldump">--extended-insert</option> option. Use
+ <option role="mysqldump">--skip-opt</option> instead.
</para>
<para condition="dynamic:optvar:commandoptions" role="6.0:mysqldump:all"/>
@@ -5930,7 +5936,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--complete-insert</option>, <option>-c</option>
+ <option role="mysqldump">--complete-insert</option>,
+ <option>-c</option>
</para>
<para>
@@ -6100,8 +6107,8 @@
<para>
This option has no effect for output data files produced by
- using the <option role="mysqldump">--tab</option> option. See the description
- for that option.
+ using the <option role="mysqldump">--tab</option> option.
+ See the description for that option.
</para>
</listitem>
@@ -6160,7 +6167,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--disable-keys</option>, <option>-K</option>
+ <option role="mysqldump">--disable-keys</option>,
+ <option>-K</option>
</para>
<para>
@@ -6202,9 +6210,10 @@
<option role="mysqldump">--dump-date</option> and
<option>--skip-dump-date</option> control whether the date
is added to the comment. The default is
- <option role="mysqldump">--dump-date</option> (include the date in the
- comment). <option>--skip-dump-date</option> suppresses date
- printing. This option was added in MySQL 6.0.4.
+ <option role="mysqldump">--dump-date</option> (include the
+ date in the comment). <option>--skip-dump-date</option>
+ suppresses date printing. This option was added in MySQL
+ 6.0.4.
</para>
</listitem>
@@ -6250,10 +6259,12 @@
</para>
<para>
- In conjunction with <option role="mysqldump">--dump-slave</option>, the
- <option role="mysqldump">--apply-slave-statements</option> and
- <option role="mysqldump">--include-master-host-port</option> options can also
- be used.
+ In conjunction with
+ <option role="mysqldump">--dump-slave</option>, the
+ <option role="mysqldump">--apply-slave-statements</option>
+ and
+ <option role="mysqldump">--include-master-host-port</option>
+ options can also be used.
</para>
</listitem>
@@ -6269,7 +6280,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--events</option>, <option>-E</option>
+ <option role="mysqldump">--events</option>,
+ <option>-E</option>
</para>
<para>
@@ -6289,7 +6301,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--extended-insert</option>, <option>-e</option>
+ <option role="mysqldump">--extended-insert</option>,
+ <option>-e</option>
</para>
<para>
@@ -6371,7 +6384,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--first-slave</option>, <option>-x</option>
+ <option role="mysqldump">--first-slave</option>,
+ <option>-x</option>
</para>
<para>
@@ -6392,7 +6406,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--flush-logs</option>, <option>-F</option>
+ <option role="mysqldump">--flush-logs</option>,
+ <option>-F</option>
</para>
<para>
@@ -6408,8 +6423,9 @@
case, the logs are flushed only once, corresponding to the
moment that all tables are locked. If you want your dump and
the log flush to happen at exactly the same moment, you
- should use <option role="mysqldump">--flush-logs</option> together with
- either <option role="mysqldump">--lock-all-tables</option> or
+ should use <option role="mysqldump">--flush-logs</option>
+ together with either
+ <option role="mysqldump">--lock-all-tables</option> or
<option role="mysqldump">--master-data</option>.
</para>
</listitem>
@@ -6625,7 +6641,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--lock-all-tables</option>, <option>-x</option>
+ <option role="mysqldump">--lock-all-tables</option>,
+ <option>-x</option>
</para>
<para>
@@ -6649,7 +6666,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--lock-tables</option>, <option>-l</option>
+ <option role="mysqldump">--lock-tables</option>,
+ <option>-l</option>
</para>
<para>
@@ -6658,15 +6676,16 @@
inserts in the case of <literal>MyISAM</literal> tables. For
transactional tables such as <literal>InnoDB</literal> and
<literal>BDB</literal>,
- <option role="mysqldump">--single-transaction</option> is a much better
- option, because it does not need to lock the tables at all.
+ <option role="mysqldump">--single-transaction</option> is a
+ much better option, because it does not need to lock the
+ tables at all.
</para>
<para>
Please note that when dumping multiple databases,
- <option role="mysqldump">--lock-tables</option> locks tables for each
- database separately. Therefore, this option does not
- guarantee that the tables in the dump file are logically
+ <option role="mysqldump">--lock-tables</option> locks tables
+ for each database separately. Therefore, this option does
+ not guarantee that the tables in the dump file are logically
consistent between databases. Tables in different databases
may be dumped in completely different states.
</para>
@@ -6735,19 +6754,24 @@
<para>
The <option role="mysqldump">--master-data</option> option
- automatically turns off <option role="mysqldump">--lock-tables</option>. It
- also turns on <option role="mysqldump">--lock-all-tables</option>, unless
- <option role="mysqldump">--single-transaction</option> also is specified, in
- which case, a global read lock is acquired only for a short
- time at the beginning of the dump (see the description for
- <option role="mysqldump">--single-transaction</option>). In all cases, any
- action on logs happens at the exact moment of the dump.
+ automatically turns off
+ <option role="mysqldump">--lock-tables</option>. It also
+ turns on
+ <option role="mysqldump">--lock-all-tables</option>, unless
+ <option role="mysqldump">--single-transaction</option> also
+ is specified, in which case, a global read lock is acquired
+ only for a short time at the beginning of the dump (see the
+ description for
+ <option role="mysqldump">--single-transaction</option>). In
+ all cases, any action on logs happens at the exact moment of
+ the dump.
</para>
<para>
It is also possible to set up a slave by dumping an existing
slave of the master. To do this, use the
- <option role="mysqldump">--dump-slave</option> option instead.
+ <option role="mysqldump">--dump-slave</option> option
+ instead.
</para>
</listitem>
@@ -6786,7 +6810,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--no-create-db</option>, <option>-n</option>
+ <option role="mysqldump">--no-create-db</option>,
+ <option>-n</option>
</para>
<para>
@@ -6809,7 +6834,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--no-create-info</option>, <option>-t</option>
+ <option role="mysqldump">--no-create-info</option>,
+ <option>-t</option>
</para>
<para>
@@ -6830,7 +6856,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--no-data</option>, <option>-d</option>
+ <option role="mysqldump">--no-data</option>,
+ <option>-d</option>
</para>
<para>
@@ -6866,8 +6893,9 @@
</para>
<para>
- <emphasis>The <option role="mysqldump">--opt</option> option is enabled by
- default. Use <option role="mysqldump">--skip-opt</option> to disable
+ <emphasis>The <option role="mysqldump">--opt</option> option
+ is enabled by default. Use
+ <option role="mysqldump">--skip-opt</option> to disable
it.</emphasis> See the discussion at the beginning of this
section for information about selectively enabling or
disabling certain of the options affected by
@@ -7035,7 +7063,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--quote-names</option>, <option>-Q</option>
+ <option role="mysqldump">--quote-names</option>,
+ <option>-Q</option>
</para>
<para>
@@ -7047,8 +7076,8 @@
is enabled by default. It can be disabled with
<option>--skip-quote-names</option>, but this option should
be given after any option such as
- <option role="mysqldump">--compatible</option> that may enable
- <option role="mysqldump">--quote-names</option>.
+ <option role="mysqldump">--compatible</option> that may
+ enable <option role="mysqldump">--quote-names</option>.
</para>
</listitem>
@@ -7113,7 +7142,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option role="mysqldump">--routines</option>, <option>-R</option>
+ <option role="mysqldump">--routines</option>,
+ <option>-R</option>
</para>
<para>
@@ -7134,9 +7164,9 @@
<para>
If you require routines to be re-created with their original
timestamp attributes, do not use
- <option role="mysqldump">--routines</option>. Instead, dump and reload the
- contents of the <literal>mysql.proc</literal> table
- directly, using a MySQL account that has appropriate
+ <option role="mysqldump">--routines</option>. Instead, dump
+ and reload the contents of the <literal>mysql.proc</literal>
+ table directly, using a MySQL account that has appropriate
privileges for the <literal>mysql</literal> database.
</para>
</listitem>
@@ -7201,11 +7231,13 @@
</para>
<para>
- While a <option role="mysqldump">--single-transaction</option> dump is in
- process, to ensure a valid dump file (correct table contents
- and binary log position), no other connection should use the
- following statements: <literal role="stmt">ALTER
- TABLE</literal>, <literal role="stmt">DROP TABLE</literal>,
+ While a
+ <option role="mysqldump">--single-transaction</option> dump
+ is in process, to ensure a valid dump file (correct table
+ contents and binary log position), no other connection
+ should use the following statements:
+ <literal role="stmt">ALTER TABLE</literal>,
+ <literal role="stmt">DROP TABLE</literal>,
<literal role="stmt">RENAME TABLE</literal>,
<literal role="stmt" condition="truncate">TRUNCATE
TABLE</literal>. A consistent read is not isolated from
@@ -7216,9 +7248,10 @@
</para>
<para>
- The <option role="mysqldump">--single-transaction</option> option and the
- <option role="mysqldump">--lock-tables</option> option are mutually
- exclusive, because <literal role="stmt">LOCK
+ The <option role="mysqldump">--single-transaction</option>
+ option and the
+ <option role="mysqldump">--lock-tables</option> option are
+ mutually exclusive, because <literal role="stmt">LOCK
TABLES</literal> causes any pending transactions to be
committed implicitly.
</para>
@@ -7266,7 +7299,8 @@
</para>
<para>
- See the description for the <option role="mysqldump">--opt</option> option.
+ See the description for the
+ <option role="mysqldump">--opt</option> option.
</para>
</listitem>
@@ -7443,10 +7477,10 @@
option, <literal role="type">TIMESTAMP</literal> columns are
dumped and reloaded in the time zones local to the source
and destination servers, which can cause the values to
- change. <option role="mysqldump">--tz-utc</option> also protects against
- changes due to daylight saving time.
- <option role="mysqldump">--tz-utc</option> is enabled by default. To disable
- it, use <option>--skip-tz-utc</option>.
+ change. <option role="mysqldump">--tz-utc</option> also
+ protects against changes due to daylight saving time.
+ <option role="mysqldump">--tz-utc</option> is enabled by
+ default. To disable it, use <option>--skip-tz-utc</option>.
</para>
</listitem>
@@ -7685,9 +7719,10 @@
<para>
The initial size of the buffer for client/server
communication. When creating multiple-row-insert statements
- (as with option <option role="mysqldump">--extended-insert</option> or
- <option role="mysqldump">--opt</option>), <command>mysqldump</command>
- creates rows up to
+ (as with option
+ <option role="mysqldump">--extended-insert</option> or
+ <option role="mysqldump">--opt</option>),
+ <command>mysqldump</command> creates rows up to
<literal role="sysvar">net_buffer_length</literal> length.
If you increase this variable, you should also ensure that
the <literal role="sysvar">net_buffer_length</literal>
@@ -7797,10 +7832,11 @@
<para>
The <option role="mysqldump">--master-data</option> and
- <option role="mysqldump">--single-transaction</option> options can be used
- simultaneously, which provides a convenient way to make an
- online backup suitable for point-in-time recovery if tables are
- stored using the <literal>InnoDB</literal> storage engine.
+ <option role="mysqldump">--single-transaction</option> options
+ can be used simultaneously, which provides a convenient way to
+ make an online backup suitable for point-in-time recovery if
+ tables are stored using the <literal>InnoDB</literal> storage
+ engine.
</para>
<para>
@@ -8252,8 +8288,8 @@
</para>
<para>
- See the description for the <option role="mysqldump">--replace</option>
- option.
+ See the description for the
+ <option role="mysqldump">--replace</option> option.
</para>
</listitem>
@@ -8350,7 +8386,8 @@
<secondary>mysqlimport</secondary>
</indexterm>
- <option role="mysqldump">--lock-tables</option>, <option>-l</option>
+ <option role="mysqldump">--lock-tables</option>,
+ <option>-l</option>
</para>
<para>
@@ -8495,20 +8532,21 @@
<secondary>mysqlimport</secondary>
</indexterm>
- <option role="mysqldump">--replace</option>, <option>-r</option>
+ <option role="mysqldump">--replace</option>,
+ <option>-r</option>
</para>
<para>
- The <option role="mysqldump">--replace</option> and <option>--ignore</option>
- options control handling of input rows that duplicate
- existing rows on unique key values. If you specify
- <option role="mysqldump">--replace</option>, new rows replace existing rows
- that have the same unique key value. If you specify
- <option>--ignore</option>, input rows that duplicate an
- existing row on a unique key value are skipped. If you do
- not specify either option, an error occurs when a duplicate
- key value is found, and the rest of the text file is
- ignored.
+ The <option role="mysqldump">--replace</option> and
+ <option>--ignore</option> options control handling of input
+ rows that duplicate existing rows on unique key values. If
+ you specify <option role="mysqldump">--replace</option>, new
+ rows replace existing rows that have the same unique key
+ value. If you specify <option>--ignore</option>, input rows
+ that duplicate an existing row on a unique key value are
+ skipped. If you do not specify either option, an error
+ occurs when a duplicate key value is found, and the rest of
+ the text file is ignored.
</para>
</listitem>
Modified: trunk/refman-6.0/replication-options-core.xml
===================================================================
--- trunk/refman-6.0/replication-options-core.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-6.0/replication-options-core.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 4; 1331 bytes
@@ -31,7 +31,8 @@
<secondary>server-id option</secondary>
</indexterm>
- Of particular importance is the <option role="mysqld">--server-id</option> option.
+ Of particular importance is the
+ <option role="mysqld">--server-id</option> option.
</para>
<para condition="dynamic:optvar:item" role="6.0:mysqld:server-id"/>
@@ -46,9 +47,9 @@
<para>
On the master and each slave, you <emphasis>must</emphasis> use the
- <option role="mysqld">--server-id</option> option to establish a unique
- replication ID. For each server participating in replication, you
- should pick a positive integer in the range from 1 to
+ <option role="mysqld">--server-id</option> option to establish a
+ unique replication ID. For each server participating in replication,
+ you should pick a positive integer in the range from 1 to
2<superscript>32</superscript> −, and each ID must be
different from every other ID in use by any other replication master
or slave. Example: <literal>server-id=3</literal>.
Modified: trunk/refman-6.0/se-innodb-core.xml
===================================================================
--- trunk/refman-6.0/se-innodb-core.xml 2009-02-13 03:11:24 UTC (rev 13743)
+++ trunk/refman-6.0/se-innodb-core.xml 2009-02-13 03:11:43 UTC (rev 13744)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1507 bytes
@@ -4296,9 +4296,9 @@
corruption becomes easier. Also, because the format is simpler,
the chance for serious data corruption is smaller.
<command>mysqldump</command> also has a
- <option role="mysqldump">--single-transaction</option> option that you can use to
- make a consistent snapshot without locking out other clients. See
- <xref linkend="backup-policy"/>.
+ <option role="mysqldump">--single-transaction</option> option that
+ you can use to make a consistent snapshot without locking out
+ other clients. See <xref linkend="backup-policy"/>.
</para>
<para>
@@ -6392,9 +6392,9 @@
<para>
If you use the <command>mysqldump</command> option
- <option role="mysqldump">--opt</option>, you get dump files that are fast to
- import into an <literal>InnoDB</literal> table, even without
- wrapping them with the
+ <option role="mysqldump">--opt</option>, you get dump files
+ that are fast to import into an <literal>InnoDB</literal>
+ table, even without wrapping them with the
<literal role="stmt" condition="commit">SET
autocommit</literal> and <literal role="stmt">COMMIT</literal>
statements.
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r13744 - in trunk: . dynamic-docs/changelog refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul.dubois | 13 Feb |
