Author: paul
Date: 2008-10-22 23:14:48 +0200 (Wed, 22 Oct 2008)
New Revision: 12131
Log:
r34923@frost: paul | 2008-10-22 16:15:15 -0500
Update query-log and slow-query-log sections to account for
--log/--log-slow-queries deprecation
Modified:
trunk/refman-5.1/dba-core.xml
trunk/refman-6.0/dba-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:34919
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:33695
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:34923
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:33695
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2008-10-22 18:55:31 UTC (rev 12130)
+++ trunk/refman-5.1/dba-core.xml 2008-10-22 21:14:48 UTC (rev 12131)
Changed blocks: 9, Lines Added: 57, Lines Deleted: 54; 9999 bytes
@@ -1694,10 +1694,9 @@
<para condition="dynamic:optvar:item" role="5.1:mysqld:log-queries-not-using-indexes"/>
<para>
- If you are using this option with
- <option>--log-slow-queries</option>, queries that do not use
- indexes are logged to the slow query log. See
- <xref linkend="slow-query-log"/>.
+ If you are using this option with the slow query log
+ enabled, queries that do not use indexes are logged to the
+ slow query log. See <xref linkend="slow-query-log"/>.
</para>
</listitem>
@@ -5821,8 +5820,7 @@
<para>
If a query takes longer than this many seconds, the server
increments the <literal>Slow_queries</literal> status
- variable. If you are using the
- <option>--log-slow-queries</option> option, the query is
+ variable. If the slow query log is enabled, the query is
logged to the slow query log file. This value is measured in
real time, not CPU time, so a query that is under the
threshold on a lightly loaded system might be above the
@@ -13145,25 +13143,29 @@
</para>
<para>
- To enable the general query log as of MySQL 5.1.6, start
+ Before 5.1.6, the general query log destination is always a
+ file. To enable the general query log file, use the
+ <option>--log[=<replaceable>file_name</replaceable>]</option> or
+ <option>-l [<replaceable>file_name</replaceable>]</option>
+ option. To enable the general query log as of MySQL 5.1.6, start
<command>mysqld</command> with the
<option>--log[=<replaceable>file_name</replaceable>]</option> or
<option>-l [<replaceable>file_name</replaceable>]</option>
option, and optionally use <option>--log-output</option> to
specify the log destination (as described in
- <xref linkend="log-tables"/>). Before 5.1.6, the general query
- log destination is always a file. To enable the general query
- log file, use the
- <option>--log[=<replaceable>file_name</replaceable>]</option> or
- <option>-l [<replaceable>file_name</replaceable>]</option>
- option.
+ <xref linkend="log-tables"/>). As of MySQL 5.1.29,
+ <option>--log</option> and <option>-l</option> are deprecated.
+ Use <option>--general_log</option> to enable the general query
+ log, and optionally
+ <option>--general_log_file=<replaceable>file_name</replaceable></option>
+ to specify a log filename.
</para>
<para>
- If no <replaceable>file_name</replaceable> value is given for
- <option>--log</option> or <option>-l</option>, the default name
- is <filename><replaceable>host_name</replaceable>.log</filename>
- in the data directory. If a filename is given, but not as an
+ If you specify no filename for the general query log, the
+ default name is
+ <filename><replaceable>host_name</replaceable>.log</filename> in
+ the data directory. If you specify a filename that is not an
absolute pathname, the server writes the file in the data
directory.
</para>
@@ -13174,15 +13176,13 @@
of MySQL 5.1.12 to specify the initial general query log state.
With no argument or an argument of 0, the option disables the
log. If omitted or given with an argument of 1, the option
- enables the log. If <option>--log</option> or
- <option>-l</option> is not specified,
- <option>--general-log</option> has no effect.
+ enables the log.
</para>
<para>
The global <literal>general_log</literal> and
- <literal>general_log_file</literal> system variables provide
- runtime control over the general query log. Set
+ <literal>general_log_file</literal> system variables can be set
+ at runtime to control logging to the general query log. Set
<literal>general_log</literal> to 0 (or <literal>OFF</literal>)
to disable the log or to 1 (or <literal>ON</literal>) to enable
it. Set <literal>general_log_file</literal> to specify the name
@@ -13193,11 +13193,11 @@
<para>
When the general query log is enabled, output is written to any
destinations specified by the <option>--log-output</option>
- option or <literal>log_output</literal> system variable. Note
- that if the destination is <literal>NONE</literal>, no output is
- written even if the general log is enabled. Setting the log
- filename has no effect on logging if the log destination value
- does not contain <literal>FILE</literal>.
+ option or <literal>log_output</literal> system variable. If the
+ destination is <literal>NONE</literal>, no output is written
+ even if the general log is enabled. Setting the log filename has
+ no effect on logging if the log destination value does not
+ contain <literal>FILE</literal>.
</para>
<para>
@@ -14808,24 +14808,29 @@
</para>
<para>
- To enable the slow query log as of MySQL 5.1.6, start
+ Before 5.1.6, the slow query log destination is always a file.
+ To enable the slow query log file, use the
+ <option>--log-slow-queries[=<replaceable>file_name</replaceable>]</option>
+ option. To enable the slow query log as of MySQL 5.1.6, start
<command>mysqld</command> with the
<option>--log-slow-queries[=<replaceable>file_name</replaceable>]</option>
option, and optionally use <option>--log-output</option> to
specify the log destination (as described in
- <xref linkend="log-tables"/>). Before 5.1.6, the slow query log
- destination is always a file. To enable the slow query log file,
- use the
- <option>--log-slow-queries[=<replaceable>file_name</replaceable>]</option>
- option.
+ <xref linkend="log-tables"/>). As of MySQL 5.1.29,
+ <option>--log-slow-queries</option> is deprecated. Use
+ <option>--slow_query_log</option> to enable the slow query log,
+ and optionally
+ <option>--slow_query_log_file=<replaceable>file_name</replaceable></option>
+ to specify a log filename.
</para>
<para>
- If no <replaceable>file_name</replaceable> value is given for
- <option>--log-slow-queries</option>, the default name is
- <filename><replaceable>host_name</replaceable>-slow.log</filename>.
- If a filename is given, but not as an absolute pathname, the
- server writes the file in the data directory.
+ If you specify no filename for the slow query log, the default
+ name is
+ <filename><replaceable>host_name</replaceable>-slow.log</filename>
+ in the data directory. If you specify a filename that is not an
+ absolute pathname, the server writes the file in the data
+ directory.
</para>
<para>
@@ -14834,14 +14839,13 @@
MySQL 5.1.12 to specify the initial slow query log state. With
no argument or an argument of 0, the option disables the log. If
omitted or given with an argument of 1, the option enables the
- log. If <option>--log-slow-queries</option> is not given,
- <option>--slow-query-log</option> has no effect.
+ log.
</para>
<para>
The global <literal>slow_query_log</literal> and
- <literal>slow_query_log_file</literal> system variables provide
- runtime control over the slow query log. Set
+ <literal>slow_query_log_file</literal> system variables can be
+ set at runtime to control logging to the slow query log. Set
<literal>slow_query_log</literal> to 0 (or
<literal>OFF</literal>) to disable the log or to 1 (or
<literal>ON</literal>) to enable it. Set
@@ -14853,11 +14857,11 @@
<para>
When the slow query log is enabled, output is written to any
destinations specified by the <option>--log-output</option>
- option or <literal>log_output</literal> system variable. Note
- that if the destination is <literal>NONE</literal>, no output is
- written even if the slow query log is enabled. Setting the log
- filename has no effect on logging if the log destination value
- does not contain <literal>FILE</literal>.
+ option or <literal>log_output</literal> system variable. If the
+ destination is <literal>NONE</literal>, no output is written
+ even if the slow query log is enabled. Setting the log filename
+ has no effect on logging if the log destination value does not
+ contain <literal>FILE</literal>.
</para>
<para>
@@ -14982,18 +14986,17 @@
<listitem>
<para>
- If general query logging (<option>--log</option>) or slow
- query logging (<option>--log-slow-queries</option>) to a log
- file is enabled, the server closes and reopens the general
- query log file or slow query log file.
+ If general query logging or slow query logging to a log file
+ is enabled, the server closes and reopens the general query
+ log file or slow query log file.
</para>
</listitem>
<listitem>
<para>
- If binary logging (<option>--log-bin</option>) is used, the
- server closes the current log file and opens a new log file
- with the next sequence number.
+ If binary logging is enabled, the server closes the current
+ binary log file and opens a new log file with the next
+ sequence number.
</para>
</listitem>
Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml 2008-10-22 18:55:31 UTC (rev 12130)
+++ trunk/refman-6.0/dba-core.xml 2008-10-22 21:14:48 UTC (rev 12131)
Changed blocks: 9, Lines Added: 58, Lines Deleted: 44; 9423 bytes
@@ -1727,10 +1727,9 @@
<para condition="dynamic:optvar:item" role="6.0:mysqld:log-queries-not-using-indexes"/>
<para>
- If you are using this option with
- <option>--log-slow-queries</option>, queries that do not use
- indexes are logged to the slow query log. See
- <xref linkend="slow-query-log"/>.
+ If you are using this option with the slow query log
+ enabled, queries that do not use indexes are logged to the
+ slow query log. See <xref linkend="slow-query-log"/>.
</para>
</listitem>
@@ -5716,8 +5715,7 @@
<para>
If a query takes longer than this many seconds, the server
increments the <literal>Slow_queries</literal> status
- variable. If you are using the
- <option>--log-slow-queries</option> option, the query is
+ variable. If the slow query log is enabled, the query is
logged to the slow query log file. This value is measured in
real time, not CPU time, so a query that is under the
threshold on a lightly loaded system might be above the
@@ -13082,14 +13080,19 @@
<option>-l [<replaceable>file_name</replaceable>]</option>
option, and optionally use <option>--log-output</option> to
specify the log destination (as described in
- <xref linkend="log-tables"/>).
+ <xref linkend="log-tables"/>). As of MySQL 6.0.8,
+ <option>--log</option> and <option>-l</option> are deprecated.
+ Use <option>--general_log</option> to enable the general query
+ log, and optionally
+ <option>--general_log_file=<replaceable>file_name</replaceable></option>
+ to specify a log filename.
</para>
<para>
- If no <replaceable>file_name</replaceable> value is given for
- <option>--log</option> or <option>-l</option>, the default name
- is <filename><replaceable>host_name</replaceable>.log</filename>
- in the data directory. If a filename is given, but not as an
+ If you specify no filename for the general query log, the
+ default name is
+ <filename><replaceable>host_name</replaceable>.log</filename> in
+ the data directory. If you specify a filename that is not an
absolute pathname, the server writes the file in the data
directory.
</para>
@@ -13099,15 +13102,13 @@
the <option>--general-log</option> option also may be given to
specify the initial general query log state. With no argument or
an argument of 0, the option disables the log. If omitted or
- given with an argument of 1, the option enables the log. If
- <option>--log</option> or <option>-l</option> is not specified,
- <option>--general-log</option> has no effect.
+ given with an argument of 1, the option enables the log.
</para>
<para>
The global <literal>general_log</literal> and
- <literal>general_log_file</literal> system variables provide
- runtime control over the general query log. Set
+ <literal>general_log_file</literal> system variables can be set
+ at runtime to control logging to the general query log. Set
<literal>general_log</literal> to 0 (or <literal>OFF</literal>)
to disable the log or to 1 (or <literal>ON</literal>) to enable
it. Set <literal>general_log_file</literal> to specify the name
@@ -13118,11 +13119,11 @@
<para>
When the general query log is enabled, output is written to any
destinations specified by the <option>--log-output</option>
- option or <literal>log_output</literal> system variable. Note
- that if the destination is <literal>NONE</literal>, no output is
- written even if the general log is enabled. Setting the log
- filename has no effect on logging if the log destination value
- does not contain <literal>FILE</literal>.
+ option or <literal>log_output</literal> system variable. If the
+ destination is <literal>NONE</literal>, no output is written
+ even if the general log is enabled. Setting the log filename has
+ no effect on logging if the log destination value does not
+ contain <literal>FILE</literal>.
</para>
<para>
@@ -14712,15 +14713,21 @@
<option>--log-slow-queries[=<replaceable>file_name</replaceable>]</option>
option, and optionally use <option>--log-output</option> to
specify the log destination (as described in
- <xref linkend="log-tables"/>).
+ <xref linkend="log-tables"/>). As of MySQL 6.0.8,
+ <option>--log-slow-queries</option> is deprecated. Use
+ <option>--slow_query_log</option> to enable the slow query log,
+ and optionally
+ <option>--slow_query_log_file=<replaceable>file_name</replaceable></option>
+ to specify a log filename.
</para>
<para>
- If no <replaceable>file_name</replaceable> value is given for
- <option>--log-slow-queries</option>, the default name is
- <filename><replaceable>host_name</replaceable>-slow.log</filename>.
- If a filename is given, but not as an absolute pathname, the
- server writes the file in the data directory.
+ If you specify no filename for the slow query log, the default
+ name is
+ <filename><replaceable>host_name</replaceable>-slow.log</filename>
+ in the data directory. If you specify a filename that is not an
+ absolute pathname, the server writes the file in the data
+ directory.
</para>
<para>
@@ -14728,15 +14735,13 @@
<option>--slow-query-log</option> option also may be given to
specify the initial slow query log state. With no argument or an
argument of 0, the option disables the log. If omitted or given
- with an argument of 1, the option enables the log. If
- <option>--log-slow-queries</option> is not given,
- <option>--slow-query-log</option> has no effect.
+ with an argument of 1, the option enables the log.
</para>
<para>
The global <literal>slow_query_log</literal> and
- <literal>slow_query_log_file</literal> system variables provide
- runtime control over the slow query log. Set
+ <literal>slow_query_log_file</literal> system variables can be
+ set at runtime to control logging to the slow query log. Set
<literal>slow_query_log</literal> to 0 (or
<literal>OFF</literal>) to disable the log or to 1 (or
<literal>ON</literal>) to enable it. Set
@@ -14748,14 +14753,24 @@
<para>
When the slow query log is enabled, output is written to any
destinations specified by the <option>--log-output</option>
- option or <literal>log_output</literal> system variable. Note
- that if the destination is <literal>NONE</literal>, no output is
- written even if the slow query log is enabled. Setting the log
- filename has no effect on logging if the log destination value
- does not contain <literal>FILE</literal>.
+ option or <literal>log_output</literal> system variable. If the
+ destination is <literal>NONE</literal>, no output is written
+ even if the slow query log is enabled. Setting the log filename
+ has no effect on logging if the log destination value does not
+ contain <literal>FILE</literal>.
</para>
<para>
+ When the slow query log is enabled, output is written to any
+ destinations specified by the <option>--log-output</option>
+ option or <literal>log_output</literal> system variable. If the
+ destination is <literal>NONE</literal>, no output is written
+ even if the slow query log is enabled. Setting the log filename
+ has no effect on logging if the log destination value does not
+ contain <literal>FILE</literal>.
+ </para>
+
+ <para>
The slow query log can be used to find queries that take a long
time to execute and are therefore candidates for optimization.
However, examining a long slow query log can become a difficult
@@ -14877,18 +14892,17 @@
<listitem>
<para>
- If general query logging (<option>--log</option>) or slow
- query logging (<option>--log-slow-queries</option>) to a log
- file is enabled, the server closes and reopens the general
- query log file or slow query log file.
+ If general query logging or slow query logging to a log file
+ is enabled, the server closes and reopens the general query
+ log file or slow query log file.
</para>
</listitem>
<listitem>
<para>
- If binary logging (<option>--log-bin</option>) is used, the
- server closes the current log file and opens a new log file
- with the next sequence number.
+ If binary logging is enabled, the server closes the current
+ binary log file and opens a new log file with the next
+ sequence number.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r12131 - in trunk: . refman-5.1 refman-6.0 | paul.dubois | 22 Oct |
