Author: paul
Date: 2008-10-22 20:55:31 +0200 (Wed, 22 Oct 2008)
New Revision: 12130
Log:
r34919@frost: paul | 2008-10-22 13:54:32 -0500
Update "selecting log destinations" section 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:34917
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:34919
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:33:51 UTC (rev 12129)
+++ trunk/refman-5.1/dba-core.xml 2008-10-22 18:55:31 UTC (rev 12130)
Changed blocks: 5, Lines Added: 32, Lines Deleted: 21; 4715 bytes
@@ -12684,16 +12684,23 @@
</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. If you specify either option, the server
- opens the corresponding log file and writes startup messages to
- it. However, logging of queries to the file does not occur
- unless the <literal>FILE</literal> log destination is selected.
+ The <option>--general_log</option> option, if given, enables
+ logging to the general query log for the selected log
+ destinations. To specify a filename other than the default for
+ file logging, use
+ <option>--general_log_file=<replaceable>file_name</replaceable></option>.
+ Similarly, the <option>--slow_query_log</option> option, if
+ given, enables logging to the slow query log for the selected
+ destinations, and
+ <option>--slow_query_log_file=<replaceable>file_name</replaceable></option>
+ specifies a filename for file logging. If you enable either log,
+ the server opens the corresponding log file and writes startup
+ messages to it. However, logging of queries to the file does not
+ occur unless the <literal>FILE</literal> log destination is
+ selected. Prior to MySQL 5.1.29, <option>--log</option> and
+ <option>--log-slow-queries</option> enable the general query log
+ and slow query log. Either option may be given with a filename
+ argument to specify a log filename to override the default.
</para>
<para>
@@ -12706,8 +12713,9 @@
<para>
To write general query log entries to the log table and the
log file, use <option>--log-output=TABLE,FILE</option> to
- select both log destinations and the <option>--log</option>
- option to enable the general query log.
+ select both log destinations and the
+ <option>--general_log</option> option to enable the general
+ query log.
</para>
</listitem>
@@ -12715,9 +12723,10 @@
<para>
To write general and slow query log entries only to the log
tables, use <option>--log-output=TABLE</option> to select
- tables as the log destination and the <option>--log</option>
- and <option>--log-slow-queries</option> options to enable
- both logs.
+ tables as the log destination and the
+ <option>--general_log</option> and
+ <option>--slow_query_log</option> options to enable both
+ logs.
</para>
</listitem>
@@ -12725,7 +12734,7 @@
<para>
To write slow query log entries only to the log file, use
<option>--log-output=FILE</option> to select files as the
- log destination and the <option>--log-slow-queries</option>
+ log destination and the <option>--slow_query_log</option>
option to enable the slow query log. (In this case, because
the default log destination is <literal>FILE</literal>, you
could omit the <option>--log-output</option> option.)
@@ -12757,11 +12766,13 @@
The global <literal>general_log_file</literal> and
<literal>slow_query_log_file</literal> variables indicate
the names of the general query log and slow query log files.
- You can set these variables at runtime to change the names
- of the log files. (If the <option>--log</option> and
- <literal>--log-slow-queries</literal> options were not
- given, the initial variable values are the default log
- filenames.)
+ As of MySQL 5.1.29, you can set these variables at server
+ startup or at runtime to change the names of the log files.
+ Before MySQL 5.1.29, you can set these variables only at
+ runtime, but the the <option>--log</option> and
+ <literal>--log-slow-queries</literal> options can be given
+ with a filename argument at startup to change the log
+ filenames from their default values.
</para>
</listitem>
Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml 2008-10-22 18:33:51 UTC (rev 12129)
+++ trunk/refman-6.0/dba-core.xml 2008-10-22 18:55:31 UTC (rev 12130)
Changed blocks: 5, Lines Added: 32, Lines Deleted: 21; 4712 bytes
@@ -12658,16 +12658,23 @@
</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. If you specify either option, the server
- opens the corresponding log file and writes startup messages to
- it. However, logging of queries to the file does not occur
- unless the <literal>FILE</literal> log destination is selected.
+ The <option>--general_log</option> option, if given, enables
+ logging to the general query log for the selected log
+ destinations. To specify a filename other than the default for
+ file logging, use
+ <option>--general_log_file=<replaceable>file_name</replaceable></option>.
+ Similarly, the <option>--slow_query_log</option> option, if
+ given, enables logging to the slow query log for the selected
+ destinations, and
+ <option>--slow_query_log_file=<replaceable>file_name</replaceable></option>
+ specifies a filename for file logging. If you enable either log,
+ the server opens the corresponding log file and writes startup
+ messages to it. However, logging of queries to the file does not
+ occur unless the <literal>FILE</literal> log destination is
+ selected. Prior to MySQL 6.0.8, <option>--log</option> and
+ <option>--log-slow-queries</option> enable the general query log
+ and slow query log. Either option may be given with a filename
+ argument to specify a log filename to override the default.
</para>
<para>
@@ -12680,8 +12687,9 @@
<para>
To write general query log entries to the log table and the
log file, use <option>--log-output=TABLE,FILE</option> to
- select both log destinations and the <option>--log</option>
- option to enable the general query log.
+ select both log destinations and the
+ <option>--general_log</option> option to enable the general
+ query log.
</para>
</listitem>
@@ -12689,9 +12697,10 @@
<para>
To write general and slow query log entries only to the log
tables, use <option>--log-output=TABLE</option> to select
- tables as the log destination and the <option>--log</option>
- and <option>--log-slow-queries</option> options to enable
- both logs.
+ tables as the log destination and the
+ <option>--general_log</option> and
+ <option>--slow_query_log</option> options to enable both
+ logs.
</para>
</listitem>
@@ -12699,7 +12708,7 @@
<para>
To write slow query log entries only to the log file, use
<option>--log-output=FILE</option> to select files as the
- log destination and the <option>--log-slow-queries</option>
+ log destination and the <option>--slow_query_log</option>
option to enable the slow query log. (In this case, because
the default log destination is <literal>FILE</literal>, you
could omit the <option>--log-output</option> option.)
@@ -12731,11 +12740,13 @@
The global <literal>general_log_file</literal> and
<literal>slow_query_log_file</literal> variables indicate
the names of the general query log and slow query log files.
- You can set these variables at runtime to change the names
- of the log files. (If the <option>--log</option> and
- <literal>--log-slow-queries</literal> options were not
- given, the initial variable values are the default log
- filenames.)
+ As of MySQL 6.0.8, you can set these variables at server
+ startup or at runtime to change the names of the log files.
+ Before MySQL 6.0.8, you can set these variables only at
+ runtime, but the the <option>--log</option> and
+ <literal>--log-slow-queries</literal> options can be given
+ with a filename argument at startup to change the log
+ filenames from their default values.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r12130 - in trunk: . refman-5.1 refman-6.0 | paul.dubois | 22 Oct |
