Author: paul
Date: 2008-10-20 21:49:49 +0200 (Mon, 20 Oct 2008)
New Revision: 12102
Log:
r34861@frost: paul | 2008-10-20 13:22:25 -0500
--log/--log-slow-queries deprecation is now pushed into 6.0.8
Modified:
trunk/dynamic-docs/changelog/mysqld-1.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:34860
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:34861
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:33695
Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml 2008-10-20 19:49:42 UTC (rev 12101)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml 2008-10-20 19:49:49 UTC (rev 12102)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 409 bytes
@@ -31160,6 +31160,7 @@
<versions>
<version ver="5.1.29"/>
+ <version ver="6.0.8"/>
</versions>
<message>
Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml 2008-10-20 19:49:42 UTC (rev 12101)
+++ trunk/refman-6.0/dba-core.xml 2008-10-20 19:49:49 UTC (rev 12102)
Changed blocks: 8, Lines Added: 44, Lines Deleted: 9; 4966 bytes
@@ -1475,6 +1475,16 @@
option. See <xref linkend="log-tables"/>, and
<xref linkend="query-log"/>.
</para>
+
+ <para>
+ As of MySQL 6.0.8, the <option>--log</option> option is
+ deprecated and will be removed (along with the
+ <literal>log</literal> system variable) in MySQL 7.0.
+ Instead, use the <option>--general_log</option> option to
+ enable the general query log and the
+ <option>--general_log_file=<replaceable>file_name</replaceable></option>
+ option to set the general query log filename.
+ </para>
</listitem>
<listitem>
@@ -1807,6 +1817,17 @@
as the filename. See <xref linkend="log-tables"/>, and
<xref linkend="slow-query-log"/>.
</para>
+
+ <para>
+ As of MySQL 6.0.8, the <option>--log-slow-queries</option>
+ option is deprecated and will be removed (along with the
+ <literal>log_slow_queries</literal> system variable) in
+ MySQL 7.0. Instead, use the
+ <option>--slow_query_log</option> option to enable the slow
+ query log and the
+ <option>--slow_query_log_file=<replaceable>file_name</replaceable></option>
+ option to set the slow query log filename.
+ </para>
</listitem>
<listitem>
@@ -4877,8 +4898,9 @@
Whether the general query log is enabled. The value can be 0
(or <literal>OFF</literal>) to disable the log or 1 (or
<literal>ON</literal>) to enable the log. The default value
- depends on whether the <option>--log</option> option is
- given. The destination for log output is controlled by the
+ depends on whether the <option>--general_log</option> option
+ is given (<option>--log</option> before MySQL 6.0.8). The
+ destination for log output is controlled by the
<literal>log_output</literal> system variable; if that value
is <literal>NONE</literal>, no log entries are written even
if the log is enabled.
@@ -4896,7 +4918,8 @@
The name of the general query log file. The default value is
<filename><replaceable>host_name</replaceable>.log</filename>,
but the initial value can be changed with the
- <option>--log</option> option.
+ <option>--general_log_file</option> option
+ (<option>--log</option> before MySQL 6.0.8).
</para>
</listitem>
@@ -5541,6 +5564,11 @@
Whether logging of all statements to the general query log
is enabled. See <xref linkend="query-log"/>.
</para>
+
+ <para>
+ This variable is deprecated as of MySQL 6.0.8; use
+ <option>general_log</option> instead.
+ </para>
</listitem>
<listitem>
@@ -5662,6 +5690,11 @@
<literal>long_query_time</literal> variable. See
<xref linkend="slow-query-log"/>.
</para>
+
+ <para>
+ This variable is deprecated as of MySQL 6.0.8; use
+ <option>slow_query_log</option> instead.
+ </para>
</listitem>
<listitem>
@@ -7390,11 +7423,12 @@
Whether the slow query log is enabled. The value can be 0
(or <literal>OFF</literal>) to disable the log or 1 (or
<literal>ON</literal>) to enable the log. The default value
- depends on whether the <option>--log-slow-queries</option>
- option is given. The destination for log output is
- controlled by the <literal>log_output</literal> system
- variable; if that value is <literal>NONE</literal>, no log
- entries are written even if the log is enabled.
+ depends on whether the <option>--slow_query_log</option>
+ option is given (<option>--log-slow-queries</option> before
+ MySQL 6.0.8). The destination for log output is controlled
+ by the <literal>log_output</literal> system variable; if
+ that value is <literal>NONE</literal>, no log entries are
+ written even if the log is enabled.
</para>
</listitem>
@@ -7409,7 +7443,8 @@
The name of the slow query log file. The default value is
<filename><replaceable>host_name</replaceable>-slow.log</filename>,
but the initial value can be changed with the
- <option>--log-slow-queries</option> option.
+ <literal>--slow_query_log_file</literal> option
+ (<option>--log-slow-queries</option> before MySQL 6.0.8).
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r12102 - in trunk: . dynamic-docs/changelog refman-6.0 | paul.dubois | 20 Oct |
