Author: paul
Date: 2006-02-08 19:35:36 +0100 (Wed, 08 Feb 2006)
New Revision: 1247
Log:
r7240@frost: paul | 2006-02-08 12:35:29 -0600
Add mysqlbinlog options.
Modified:
trunk/
trunk/refman-4.1/client-utility-programs.xml
trunk/refman-5.0/client-utility-programs.xml
trunk/refman-5.1/client-utility-programs.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7234
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2927
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7240
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2927
Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml 2006-02-08 18:22:42 UTC (rev 1246)
+++ trunk/refman-4.1/client-utility-programs.xml 2006-02-08 18:35:36 UTC (rev 1247)
@@ -5922,6 +5922,17 @@
<listitem>
<para>
+ <option>--character-sets-dir=<replaceable>path</replaceable></option>
+ </para>
+
+ <para>
+ The directory where character sets are installed. See
+ <xref linkend="character-sets"/>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<option>--database=<replaceable>db_name</replaceable></option>,
<option>-d <replaceable>db_name</replaceable></option>
</para>
@@ -5933,6 +5944,45 @@
<listitem>
<para>
+ <option>--debug[=<replaceable>debug_options</replaceable>]</option>,
+ <option>-#
+ [<replaceable>debug_options</replaceable>]</option>
+ </para>
+
+ <para>
+ Write a debugging log. A typical
+ <replaceable>debug_options</replaceable> string is often
+ <literal>'d:t:o,<replaceable>file_name</replaceable>'</literal>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <option>--disable-log-bin</option>, <option>-D</option>
+ </para>
+
+ <para>
+ Disable binary logging. This is useful for avoiding an
+ endless loop if you use the <option>--to-last-log</option>
+ option and are sending the output to the same MySQL
+ server. This option also is useful when restoring after a
+ crash to avoid duplication of the statements you have
+ logged. This option is available as of MySQL 4.1.8.
+ </para>
+
+ <para>
+ This option requires that you have the
+ <literal>SUPER</literal> privilege. It causes
+ <command>mysqlbinlog</command> to include a <literal>SET
+ SQL_LOG_BIN=0</literal> statement in its output to disable
+ binary logging of the remaining output. The
+ <literal>SET</literal> statement is ineffective unless you
+ have the <literal>SUPER</literal> privilege.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<option>--force-read</option>, <option>-f</option>
</para>
@@ -6177,31 +6227,6 @@
<listitem>
<para>
- <option>--disable-log-bin</option>, <option>-D</option>
- </para>
-
- <para>
- Disable binary logging. This is useful for avoiding an
- endless loop if you use the <option>--to-last-log</option>
- option and are sending the output to the same MySQL
- server. This option also is useful when restoring after a
- crash to avoid duplication of the statements you have
- logged. This option is available as of MySQL 4.1.8.
- </para>
-
- <para>
- This option requires that you have the
- <literal>SUPER</literal> privilege. It causes
- <command>mysqlbinlog</command> to include a <literal>SET
- SQL_LOG_BIN=0</literal> statement in its output to disable
- binary logging of the remaining output. The
- <literal>SET</literal> statement is ineffective unless you
- have the <literal>SUPER</literal> privilege.
- </para>
- </listitem>
-
- <listitem>
- <para>
<option>--user=<replaceable>user_name</replaceable></option>,
<option>-u <replaceable>user_name</replaceable></option>
</para>
Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml 2006-02-08 18:22:42 UTC (rev 1246)
+++ trunk/refman-5.0/client-utility-programs.xml 2006-02-08 18:35:36 UTC (rev 1247)
@@ -5802,6 +5802,17 @@
<listitem>
<para>
+ <option>--character-sets-dir=<replaceable>path</replaceable></option>
+ </para>
+
+ <para>
+ The directory where character sets are installed. See
+ <xref linkend="character-sets"/>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<option>--database=<replaceable>db_name</replaceable></option>,
<option>-d <replaceable>db_name</replaceable></option>
</para>
@@ -5813,6 +5824,45 @@
<listitem>
<para>
+ <option>--debug[=<replaceable>debug_options</replaceable>]</option>,
+ <option>-#
+ [<replaceable>debug_options</replaceable>]</option>
+ </para>
+
+ <para>
+ Write a debugging log. A typical
+ <replaceable>debug_options</replaceable> string is often
+ <literal>'d:t:o,<replaceable>file_name</replaceable>'</literal>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <option>--disable-log-bin</option>, <option>-D</option>
+ </para>
+
+ <para>
+ Disable binary logging. This is useful for avoiding an
+ endless loop if you use the <option>--to-last-log</option>
+ option and are sending the output to the same MySQL
+ server. This option also is useful when restoring after a
+ crash to avoid duplication of the statements you have
+ logged.
+ </para>
+
+ <para>
+ This option requires that you have the
+ <literal>SUPER</literal> privilege. It causes
+ <command>mysqlbinlog</command> to include a <literal>SET
+ SQL_LOG_BIN=0</literal> statement in its output to disable
+ binary logging of the remaining output. The
+ <literal>SET</literal> statement is ineffective unless you
+ have the <literal>SUPER</literal> privilege.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<option>--force-read</option>, <option>-f</option>
</para>
@@ -6065,31 +6115,6 @@
<listitem>
<para>
- <option>--disable-log-bin</option>, <option>-D</option>
- </para>
-
- <para>
- Disable binary logging. This is useful for avoiding an
- endless loop if you use the <option>--to-last-log</option>
- option and are sending the output to the same MySQL
- server. This option also is useful when restoring after a
- crash to avoid duplication of the statements you have
- logged.
- </para>
-
- <para>
- This option requires that you have the
- <literal>SUPER</literal> privilege. It causes
- <command>mysqlbinlog</command> to include a <literal>SET
- SQL_LOG_BIN=0</literal> statement in its output to disable
- binary logging of the remaining output. The
- <literal>SET</literal> statement is ineffective unless you
- have the <literal>SUPER</literal> privilege.
- </para>
- </listitem>
-
- <listitem>
- <para>
<option>--user=<replaceable>user_name</replaceable></option>,
<option>-u <replaceable>user_name</replaceable></option>
</para>
Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml 2006-02-08 18:22:42 UTC (rev 1246)
+++ trunk/refman-5.1/client-utility-programs.xml 2006-02-08 18:35:36 UTC (rev 1247)
@@ -5816,6 +5816,17 @@
<listitem>
<para>
+ <option>--character-sets-dir=<replaceable>path</replaceable></option>
+ </para>
+
+ <para>
+ The directory where character sets are installed. See
+ <xref linkend="character-sets"/>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<option>--database=<replaceable>db_name</replaceable></option>,
<option>-d <replaceable>db_name</replaceable></option>
</para>
@@ -5827,6 +5838,45 @@
<listitem>
<para>
+ <option>--debug[=<replaceable>debug_options</replaceable>]</option>,
+ <option>-#
+ [<replaceable>debug_options</replaceable>]</option>
+ </para>
+
+ <para>
+ Write a debugging log. A typical
+ <replaceable>debug_options</replaceable> string is often
+ <literal>'d:t:o,<replaceable>file_name</replaceable>'</literal>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <option>--disable-log-bin</option>, <option>-D</option>
+ </para>
+
+ <para>
+ Disable binary logging. This is useful for avoiding an
+ endless loop if you use the <option>--to-last-log</option>
+ option and are sending the output to the same MySQL
+ server. This option also is useful when restoring after a
+ crash to avoid duplication of the statements you have
+ logged.
+ </para>
+
+ <para>
+ This option requires that you have the
+ <literal>SUPER</literal> privilege. It causes
+ <command>mysqlbinlog</command> to include a <literal>SET
+ SQL_LOG_BIN=0</literal> statement in its output to disable
+ binary logging of the remaining output. The
+ <literal>SET</literal> statement is ineffective unless you
+ have the <literal>SUPER</literal> privilege.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<option>--force-read</option>, <option>-f</option>
</para>
@@ -6091,31 +6141,6 @@
<listitem>
<para>
- <option>--disable-log-bin</option>, <option>-D</option>
- </para>
-
- <para>
- Disable binary logging. This is useful for avoiding an
- endless loop if you use the <option>--to-last-log</option>
- option and are sending the output to the same MySQL
- server. This option also is useful when restoring after a
- crash to avoid duplication of the statements you have
- logged.
- </para>
-
- <para>
- This option requires that you have the
- <literal>SUPER</literal> privilege. It causes
- <command>mysqlbinlog</command> to include a <literal>SET
- SQL_LOG_BIN=0</literal> statement in its output to disable
- binary logging of the remaining output. The
- <literal>SET</literal> statement is ineffective unless you
- have the <literal>SUPER</literal> privilege.
- </para>
- </listitem>
-
- <listitem>
- <para>
<option>--user=<replaceable>user_name</replaceable></option>,
<option>-u <replaceable>user_name</replaceable></option>
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1247 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 8 Feb |
