Author: paul
Date: 2006-02-08 19:22:42 +0100 (Wed, 08 Feb 2006)
New Revision: 1246
Log:
r7234@frost: paul | 2006-02-08 12:20:46 -0600
Add mysql options.
Modified:
trunk/
trunk/refman-4.1/client-utility-programs.xml
trunk/refman-4.1/innodb.xml
trunk/refman-5.0/client-utility-programs.xml
trunk/refman-5.0/innodb.xml
trunk/refman-5.1/client-utility-programs.xml
trunk/refman-5.1/innodb.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7233
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2927
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7234
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:28 UTC (rev 1245)
+++ trunk/refman-4.1/client-utility-programs.xml 2006-02-08 18:22:42 UTC (rev 1246)
@@ -2880,6 +2880,26 @@
<listitem>
<para>
<indexterm>
+ <primary><literal>auto-rehash</literal></primary>
+ <secondary><command>mysql</command> option</secondary>
+ </indexterm>
+
+ <option>--auto-rehash</option>
+ </para>
+
+ <para>
+ Enable automatic rehashing. This option is on by default,
+ which enables table and column name completion. Use
+ <option>--skip-auto-rehash</option> to disable rehashing.
+ That causes <command>mysql</command> to start faster, but
+ you must issue the <literal>rehash</literal> command if
+ you want to use table and column name completion.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
<primary><literal>batch</literal></primary>
<secondary><command>mysql</command> option</secondary>
</indexterm>
@@ -2913,6 +2933,21 @@
<listitem>
<para>
<indexterm>
+ <primary><literal>column-names</literal></primary>
+ <secondary><command>mysql</command> option</secondary>
+ </indexterm>
+
+ <option>--column-names</option>
+ </para>
+
+ <para>
+ Write column names in results.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
<primary><literal>compress</literal></primary>
<secondary><command>mysql</command> option</secondary>
</indexterm>
@@ -2998,6 +3033,22 @@
<listitem>
<para>
<indexterm>
+ <primary><literal>delimiter</literal></primary>
+ <secondary><command>mysql</command> option</secondary>
+ </indexterm>
+
+ <option>--delimiter=<replaceable>str</replaceable></option>
+ </para>
+
+ <para>
+ Set the statement delimiter. The default is the semicolon
+ character (‘<literal>;</literal>’).
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
<primary><literal>execute</literal></primary>
<secondary><command>mysql</command> option</secondary>
</indexterm>
@@ -3066,20 +3117,36 @@
<secondary><command>mysql</command> option</secondary>
</indexterm>
- <option>--ignore-space</option>, <option>-i</option>
+ <option>--ignore-spaces</option>, <option>-i</option>
</para>
<para>
Ignore spaces after function names. The effect of this is
- described in the discussion for
- <literal>IGNORE_SPACE</literal> in
- <xref linkend="server-sql-mode"/>.
+ described in the discussion for the
+ <literal>IGNORE_SPACE</literal> SQL mode (see
+ <xref linkend="server-sql-mode"/>).
</para>
</listitem>
<listitem>
<para>
<indexterm>
+ <primary><literal>line-numbers</literal></primary>
+ <secondary><command>mysql</command> option</secondary>
+ </indexterm>
+
+ <option>--line-numbers</option>
+ </para>
+
+ <para>
+ Write line numbers for errors. Disable this with
+ <option>--skip-line-numbers</option>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
<primary><literal>local-infile</literal></primary>
<secondary><command>mysql</command> option</secondary>
</indexterm>
@@ -3113,26 +3180,20 @@
Enable named <command>mysql</command> commands.
Long-format commands are allowed, not just short-format
commands. For example, <literal>quit</literal> and
- <literal>\q</literal> both are recognized. See
- <xref linkend="mysql-commands"/>.
+ <literal>\q</literal> both are recognized. Use
+ <option>--skip-named-commands</option> to disable named
+ commands. See <xref linkend="mysql-commands"/>.
</para>
</listitem>
<listitem>
<para>
- <indexterm>
- <primary><literal>no-auto-rehash</literal></primary>
- <secondary><command>mysql</command> option</secondary>
- </indexterm>
-
<option>--no-auto-rehash</option>, <option>-A</option>
</para>
<para>
- No automatic rehashing. This option causes
- <command>mysql</command> to start faster, but you must
- issue the <literal>rehash</literal> command if you want to
- use table and column name completion.
+ Deprecated form of <option>-skip-auto-rehash</option>. See
+ the description for <option>--auto-rehash</option>.
</para>
</listitem>
@@ -3184,9 +3245,8 @@
</para>
<para>
- Do not use a pager for displaying query output.
- <xref linkend="mysql-commands"/>, discusses output paging
- further.
+ Deprecated form of <option>--skip-pager</option>. See the
+ <option>--pager</option> option.
</para>
</listitem>
@@ -3241,7 +3301,8 @@
pagers are <command>less</command>,
<command>more</command>, <command>cat [>
filename]</command>, and so forth. This option works only
- on Unix. It does not work in batch mode.
+ on Unix. It does not work in batch mode. To disable
+ paging, use <option>--skip-pager</option>.
<xref linkend="mysql-commands"/>, discusses output paging
further.
</para>
Modified: trunk/refman-4.1/innodb.xml
===================================================================
--- trunk/refman-4.1/innodb.xml 2006-02-08 18:22:28 UTC (rev 1245)
+++ trunk/refman-4.1/innodb.xml 2006-02-08 18:22:42 UTC (rev 1246)
@@ -7299,11 +7299,11 @@
<literal>DROP TABLE</literal> successfully, the problem may be
due to name completion in the <command>mysql</command> client.
To work around this problem, start the <command>mysql</command>
- client with the <option>--disable-auto-rehash</option> option
- and try <literal>DROP TABLE</literal> again. (With name
- completion on, <command>mysql</command> tries to construct a
- list of table names, which fails when a problem such as just
- described exists.)
+ client with the <option>--skip-auto-rehash</option> option and
+ try <literal>DROP TABLE</literal> again. (With name completion
+ on, <command>mysql</command> tries to construct a list of table
+ names, which fails when a problem such as just described
+ exists.)
</para>
<para>
Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml 2006-02-08 18:22:28 UTC (rev 1245)
+++ trunk/refman-5.0/client-utility-programs.xml 2006-02-08 18:22:42 UTC (rev 1246)
@@ -2748,6 +2748,26 @@
<listitem>
<para>
<indexterm>
+ <primary><literal>auto-rehash</literal></primary>
+ <secondary><command>mysql</command> option</secondary>
+ </indexterm>
+
+ <option>--auto-rehash</option>
+ </para>
+
+ <para>
+ Enable automatic rehashing. This option is on by default,
+ which enables table and column name completion. Use
+ <option>--skip-auto-rehash</option> to disable rehashing.
+ That causes <command>mysql</command> to start faster, but
+ you must issue the <literal>rehash</literal> command if
+ you want to use table and column name completion.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
<primary><literal>batch</literal></primary>
<secondary><command>mysql</command> option</secondary>
</indexterm>
@@ -2781,6 +2801,21 @@
<listitem>
<para>
<indexterm>
+ <primary><literal>column-names</literal></primary>
+ <secondary><command>mysql</command> option</secondary>
+ </indexterm>
+
+ <option>--column-names</option>
+ </para>
+
+ <para>
+ Write column names in results.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
<primary><literal>compress</literal></primary>
<secondary><command>mysql</command> option</secondary>
</indexterm>
@@ -2866,6 +2901,22 @@
<listitem>
<para>
<indexterm>
+ <primary><literal>delimiter</literal></primary>
+ <secondary><command>mysql</command> option</secondary>
+ </indexterm>
+
+ <option>--delimiter=<replaceable>str</replaceable></option>
+ </para>
+
+ <para>
+ Set the statement delimiter. The default is the semicolon
+ character (‘<literal>;</literal>’).
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
<primary><literal>execute</literal></primary>
<secondary><command>mysql</command> option</secondary>
</indexterm>
@@ -2934,20 +2985,36 @@
<secondary><command>mysql</command> option</secondary>
</indexterm>
- <option>--ignore-space</option>, <option>-i</option>
+ <option>--ignore-spaces</option>, <option>-i</option>
</para>
<para>
Ignore spaces after function names. The effect of this is
- described in the discussion for
- <literal>IGNORE_SPACE</literal> in
- <xref linkend="server-sql-mode"/>.
+ described in the discussion for the
+ <literal>IGNORE_SPACE</literal> SQL mode (see
+ <xref linkend="server-sql-mode"/>).
</para>
</listitem>
<listitem>
<para>
<indexterm>
+ <primary><literal>line-numbers</literal></primary>
+ <secondary><command>mysql</command> option</secondary>
+ </indexterm>
+
+ <option>--line-numbers</option>
+ </para>
+
+ <para>
+ Write line numbers for errors. Disable this with
+ <option>--skip-line-numbers</option>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
<primary><literal>local-infile</literal></primary>
<secondary><command>mysql</command> option</secondary>
</indexterm>
@@ -2981,26 +3048,20 @@
Enable named <command>mysql</command> commands.
Long-format commands are allowed, not just short-format
commands. For example, <literal>quit</literal> and
- <literal>\q</literal> both are recognized. See
- <xref linkend="mysql-commands"/>.
+ <literal>\q</literal> both are recognized. Use
+ <option>--skip-named-commands</option> to disable named
+ commands. See <xref linkend="mysql-commands"/>.
</para>
</listitem>
<listitem>
<para>
- <indexterm>
- <primary><literal>no-auto-rehash</literal></primary>
- <secondary><command>mysql</command> option</secondary>
- </indexterm>
-
<option>--no-auto-rehash</option>, <option>-A</option>
</para>
<para>
- No automatic rehashing. This option causes
- <command>mysql</command> to start faster, but you must
- issue the <literal>rehash</literal> command if you want to
- use table and column name completion.
+ Deprecated form of <option>-skip-auto-rehash</option>. See
+ the description for <option>--auto-rehash</option>.
</para>
</listitem>
@@ -3052,9 +3113,8 @@
</para>
<para>
- Do not use a pager for displaying query output.
- <xref linkend="mysql-commands"/>, discusses output paging
- further.
+ Deprecated form of <option>--skip-pager</option>. See the
+ <option>--pager</option> option.
</para>
</listitem>
@@ -3109,7 +3169,8 @@
pagers are <command>less</command>,
<command>more</command>, <command>cat [>
filename]</command>, and so forth. This option works only
- on Unix. It does not work in batch mode.
+ on Unix. It does not work in batch mode. To disable
+ paging, use <option>--skip-pager</option>.
<xref linkend="mysql-commands"/>, discusses output paging
further.
</para>
Modified: trunk/refman-5.0/innodb.xml
===================================================================
--- trunk/refman-5.0/innodb.xml 2006-02-08 18:22:28 UTC (rev 1245)
+++ trunk/refman-5.0/innodb.xml 2006-02-08 18:22:42 UTC (rev 1246)
@@ -7236,11 +7236,11 @@
<literal>DROP TABLE</literal> successfully, the problem may be
due to name completion in the <command>mysql</command> client.
To work around this problem, start the <command>mysql</command>
- client with the <option>--disable-auto-rehash</option> option
- and try <literal>DROP TABLE</literal> again. (With name
- completion on, <command>mysql</command> tries to construct a
- list of table names, which fails when a problem such as just
- described exists.)
+ client with the <option>--skip-auto-rehash</option> option and
+ try <literal>DROP TABLE</literal> again. (With name completion
+ on, <command>mysql</command> tries to construct a list of table
+ names, which fails when a problem such as just described
+ exists.)
</para>
<para>
Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml 2006-02-08 18:22:28 UTC (rev 1245)
+++ trunk/refman-5.1/client-utility-programs.xml 2006-02-08 18:22:42 UTC (rev 1246)
@@ -2749,6 +2749,26 @@
<listitem>
<para>
<indexterm>
+ <primary><literal>auto-rehash</literal></primary>
+ <secondary><command>mysql</command> option</secondary>
+ </indexterm>
+
+ <option>--auto-rehash</option>
+ </para>
+
+ <para>
+ Enable automatic rehashing. This option is on by default,
+ which enables table and column name completion. Use
+ <option>--skip-auto-rehash</option> to disable rehashing.
+ That causes <command>mysql</command> to start faster, but
+ you must issue the <literal>rehash</literal> command if
+ you want to use table and column name completion.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
<primary><literal>batch</literal></primary>
<secondary><command>mysql</command> option</secondary>
</indexterm>
@@ -2782,6 +2802,21 @@
<listitem>
<para>
<indexterm>
+ <primary><literal>column-names</literal></primary>
+ <secondary><command>mysql</command> option</secondary>
+ </indexterm>
+
+ <option>--column-names</option>
+ </para>
+
+ <para>
+ Write column names in results.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
<primary><literal>compress</literal></primary>
<secondary><command>mysql</command> option</secondary>
</indexterm>
@@ -2867,6 +2902,22 @@
<listitem>
<para>
<indexterm>
+ <primary><literal>delimiter</literal></primary>
+ <secondary><command>mysql</command> option</secondary>
+ </indexterm>
+
+ <option>--delimiter=<replaceable>str</replaceable></option>
+ </para>
+
+ <para>
+ Set the statement delimiter. The default is the semicolon
+ character (‘<literal>;</literal>’).
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
<primary><literal>execute</literal></primary>
<secondary><command>mysql</command> option</secondary>
</indexterm>
@@ -2935,20 +2986,36 @@
<secondary><command>mysql</command> option</secondary>
</indexterm>
- <option>--ignore-space</option>, <option>-i</option>
+ <option>--ignore-spaces</option>, <option>-i</option>
</para>
<para>
Ignore spaces after function names. The effect of this is
- described in the discussion for
- <literal>IGNORE_SPACE</literal> in
- <xref linkend="server-sql-mode"/>.
+ described in the discussion for the
+ <literal>IGNORE_SPACE</literal> SQL mode (see
+ <xref linkend="server-sql-mode"/>).
</para>
</listitem>
<listitem>
<para>
<indexterm>
+ <primary><literal>line-numbers</literal></primary>
+ <secondary><command>mysql</command> option</secondary>
+ </indexterm>
+
+ <option>--line-numbers</option>
+ </para>
+
+ <para>
+ Write line numbers for errors. Disable this with
+ <option>--skip-line-numbers</option>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
<primary><literal>local-infile</literal></primary>
<secondary><command>mysql</command> option</secondary>
</indexterm>
@@ -2982,26 +3049,20 @@
Enable named <command>mysql</command> commands.
Long-format commands are allowed, not just short-format
commands. For example, <literal>quit</literal> and
- <literal>\q</literal> both are recognized. See
- <xref linkend="mysql-commands"/>.
+ <literal>\q</literal> both are recognized. Use
+ <option>--skip-named-commands</option> to disable named
+ commands. See <xref linkend="mysql-commands"/>.
</para>
</listitem>
<listitem>
<para>
- <indexterm>
- <primary><literal>no-auto-rehash</literal></primary>
- <secondary><command>mysql</command> option</secondary>
- </indexterm>
-
<option>--no-auto-rehash</option>, <option>-A</option>
</para>
<para>
- No automatic rehashing. This option causes
- <command>mysql</command> to start faster, but you must
- issue the <literal>rehash</literal> command if you want to
- use table and column name completion.
+ Deprecated form of <option>-skip-auto-rehash</option>. See
+ the description for <option>--auto-rehash</option>.
</para>
</listitem>
@@ -3053,9 +3114,8 @@
</para>
<para>
- Do not use a pager for displaying query output.
- <xref linkend="mysql-commands"/>, discusses output paging
- further.
+ Deprecated form of <option>--skip-pager</option>. See the
+ <option>--pager</option> option.
</para>
</listitem>
@@ -3110,7 +3170,8 @@
pagers are <command>less</command>,
<command>more</command>, <command>cat [>
filename]</command>, and so forth. This option works only
- on Unix. It does not work in batch mode.
+ on Unix. It does not work in batch mode. To disable
+ paging, use <option>--skip-pager</option>.
<xref linkend="mysql-commands"/>, discusses output paging
further.
</para>
Modified: trunk/refman-5.1/innodb.xml
===================================================================
--- trunk/refman-5.1/innodb.xml 2006-02-08 18:22:28 UTC (rev 1245)
+++ trunk/refman-5.1/innodb.xml 2006-02-08 18:22:42 UTC (rev 1246)
@@ -7160,11 +7160,11 @@
<literal>DROP TABLE</literal> successfully, the problem may be
due to name completion in the <command>mysql</command> client.
To work around this problem, start the <command>mysql</command>
- client with the <option>--disable-auto-rehash</option> option
- and try <literal>DROP TABLE</literal> again. (With name
- completion on, <command>mysql</command> tries to construct a
- list of table names, which fails when a problem such as just
- described exists.)
+ client with the <option>--skip-auto-rehash</option> option and
+ try <literal>DROP TABLE</literal> again. (With name completion
+ on, <command>mysql</command> tries to construct a list of table
+ names, which fails when a problem such as just described
+ exists.)
</para>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1246 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 8 Feb |
