Author: paul
Date: 2006-02-16 00:01:39 +0100 (Thu, 16 Feb 2006)
New Revision: 1341
Log:
r7602@frost: paul | 2006-02-15 16:59:23 -0600
Correct problems with description of log tables.
Modified:
trunk/
trunk/refman-5.1/database-administration.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7601
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3157
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7602
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3157
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-02-15 23:01:25 UTC (rev 1340)
+++ trunk/refman-5.1/database-administration.xml 2006-02-15 23:01:39 UTC (rev 1341)
@@ -1206,14 +1206,13 @@
</para>
<para>
- The general query log contains entries that log
- connections and SQL statements received from clients. From
- MySQL 5.1.6 and up, this option indicates the location of
- the general query log file if the
- <option>--log-output</option> is given with the
- <literal>FILE</literal> destination. Before MySQL 5.1.6,
- this open enables use of the general query log file. If
- you omit the filename, MySQL uses
+ This option enables logging to the general query log,
+ which contains entries that record client connections and
+ SQL statements received from clients. The log output
+ destination can be selected with the
+ <option>--log-output</option> option as of MySQL 5.1.6.
+ Before 5.1.6, logging occurs to the general query log
+ file. If you omit the filename, MySQL uses
<filename><replaceable>host_name</replaceable>.log</filename>
as the filename. See <xref linkend="log-tables"/>, and
<xref linkend="query-log"/>.
@@ -1342,10 +1341,21 @@
<literal>NONE</literal> is present in the option value, it
takes precedence over any other words that are present.
<literal>TABLE</literal> and <literal>FILE</literal> can
- both be given to log output to both destinations. This
- option was added in MySQL 5.1.6. For more information, see
- <xref linkend="log-tables"/>.
+ both be given to select to both log output destinations.
</para>
+
+ <para>
+ This option selects log output destinations, but does not
+ enable log output. To do that, use the
+ <option>--log</option> and
+ <option>--log-slow-queries</option> options. For more
+ information, see <xref linkend="log-tables"/>.
+ </para>
+
+ <para>
+ The <literal>--log-output</literal> option was added in
+ MySQL 5.1.6.
+ </para>
</listitem>
<listitem>
@@ -1393,21 +1403,19 @@
</para>
<para>
- The slow query log contains entries for all queries that
- have taken more than <literal>long_query_time</literal>
- seconds to execute. See the descriptions of the
- <option>--log-long-format</option> and
- <option>--log-short-format</option> options for details.
+ This option enables logging to the slow query log, which
+ contains entries for all queries that have taken more than
+ <literal>long_query_time</literal> seconds to execute. See
+ the descriptions of the <option>--log-long-format</option>
+ and <option>--log-short-format</option> options for
+ details.
</para>
<para>
- From MySQL 5.1.6 and up, the
- <option>--log-slow-queries</option> option indicates the
- location of the slow query log file if the
- <option>--log-output</option> is given with the
- <literal>FILE</literal> destination. Before MySQL 5.1.6,
- this open enables use of the slow query log file. If you
- omit the filename, MySQL uses
+ The log output destination can be selected with the
+ <option>--log-output</option> option as of MySQL 5.1.6.
+ Before 5.1.6, logging occurs to the slow query log file.
+ If you omit the filename, MySQL uses
<filename><replaceable>host_name</replaceable>-slow.log</filename>
as the filename. See <xref linkend="log-tables"/>, and
<xref linkend="slow-query-log"/>.
@@ -22478,8 +22486,9 @@
</para>
<para>
- The <option>--log-output</option> option controls the
- destination or destinations of log output. Its syntax is
+ The <option>--log-output</option> option specifies where log
+ output should be written, if logging is enabled. It does not
+ itself enable the logs. The syntax for this option is
<option>--log-output[=<replaceable>value</replaceable>,...]</option>:
</para>
@@ -22487,20 +22496,6 @@
<listitem>
<para>
- If <option>--log-output</option> is omitted, the server does
- not write general and slow query log entries.
- </para>
- </listitem>
-
- <listitem>
- <para>
- If <option>--log-output</option> is given without a value,
- the server writes log entries to the log tables.
- </para>
- </listitem>
-
- <listitem>
- <para>
If <option>--log-output</option> is given with a value, the
value can be a comma-separated list of one or more of the
words <literal>TABLE</literal> (log to tables),
@@ -22511,9 +22506,37 @@
</para>
</listitem>
+ <listitem>
+ <para>
+ If <option>--log-output</option> is omitted or given without
+ a value, the effect is the same as
+ <literal>--log-output=TABLE</literal>. That is, the table
+ destination is selected.
+ </para>
+ </listitem>
+
</itemizedlist>
<para>
+ The
+ <option>--log[=<replaceable>file_name</replaceable>]</option>
+ option, if given, enables logging to the general query log for
+ the selected log destinations. Similarly, the
+ <option>--log-slow-queries[=<replaceable>file_name</replaceable>]</option>
+ option, if given, enables logging to the slow query log for the
+ selected destinations. For both options, the filename is ignored
+ unless the <literal>FILE</literal> destination is selected.
+ </para>
+
+ <para>
+ If you specify the <option>--log</option> or
+ <option>--log-slow-queries</option> option, the server opens the
+ corresponding log file and writes startup messages to it.
+ However, query logging to the file does not occur unless the
+ <literal>FILE</literal> log destination is selected
+ </para>
+
+ <para>
Examples:
</para>
@@ -22529,27 +22552,26 @@
<listitem>
<para>
- To write log entries to the log tables and the log files,
- use <option>--log-output=TABLE,FILE</option>.
+ To write general query log entries to the log table and the
+ log file, use <option>--log-output=TABLE,FILE</option> and
+ <option>--log</option>.
</para>
</listitem>
+ <listitem>
+ <para>
+ To write general and slow query log entries only to the log
+ tables, use <option>--log-output=TABLE</option>,
+ <option>--log</option> and
+ <option>--log-slow-queries</option>. (In this case, because
+ the default log destination is <literal>TABLE</literal>, you
+ could omit the <option>--log-output</option> option.)
+ </para>
+ </listitem>
+
</itemizedlist>
<para>
- The capability of logging to log tables changes the meaning of
- the <option>--log</option> and
- <option>--log-slow-queries</option> somewhat. Before MySQL
- 5.1.6, these options enable use of the log files and optionally
- specify the log file locations. As of 5.1.6, they specify the
- location of the log files. If the options are given, the server
- opens the files and writes server startup messages to them, but
- query logging to the files does not occur unless the
- <option>--log-output</option> option is given with the
- <literal>FILE</literal> destination.
- </para>
-
- <para>
<emphasis role="bold">Note</emphasis>: For new installations of
MySQL 5.1.6 or higher, the log tables are created during the
installation procedure along with the other system tables. If
@@ -22705,10 +22727,10 @@
<para>
To enable the general query log as of MySQL 5.1.6, start
- <command>mysqld</command> with the <option>--log-output</option>
- option to specify the log output destination, and possibly the
- <option>--log</option> option, as described in
- <xref linkend="log-tables"/>. Before 5.1.2, enable the general
+ <command>mysqld</command> with the <option>--log</option>
+ option, and optionally use <option>--log-output</option> to
+ specify the log output destination as described in
+ <xref linkend="log-tables"/>. Before 5.1.6, enable the general
query log file with the
<option>--log[=<replaceable>file_name</replaceable>]</option> or
<option>-l [<replaceable>file_name</replaceable>]</option>
@@ -23298,11 +23320,11 @@
<para>
To enable the slow query log as of MySQL 5.1.6, start
- <command>mysqld</command> with the <option>--log-output</option>
- option to specify the log output destination, and possibly the
- <option>--log-slow-queries</option> option, as described in
- <xref linkend="log-tables"/>. Before 5.1.2, enable the slow
- query log file with the
+ <command>mysqld</command> with the
+ <option>--log-slow-queries</option> option, and optionally use
+ <option>--log-output</option> to specify the log output
+ destination as described in <xref linkend="log-tables"/>. Before
+ 5.1.6, enable the slow query log file with the
<option>--log-slow-queries[=<replaceable>file_name</replaceable>]</option>
option. If no <replaceable>file_name</replaceable> value is
given, the default is the name of the host machine with a suffix
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1341 - in trunk: . refman-5.1 | paul | 16 Feb |
