List:Commits« Previous MessageNext Message »
From:paul.dubois Date:October 23 2008 6:17pm
Subject:svn commit - mysqldoc@docsrva: r12137 - in trunk: . refman-5.1 refman-6.0
View as plain text  
Author: paul
Date: 2008-10-23 18:17:33 +0200 (Thu, 23 Oct 2008)
New Revision: 12137

Log:
 r34934@frost:  paul | 2008-10-23 11:17:52 -0500
 More tweaks for logging options/variables


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:34928
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:34934
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-23 04:49:49 UTC (rev 12136)
+++ trunk/refman-5.1/dba-core.xml	2008-10-23 16:17:33 UTC (rev 12137)
Changed blocks: 10, Lines Added: 58, Lines Deleted: 47; 10055 bytes

@@ -12639,6 +12639,7 @@
       </para>
 
       <para>
+        <emphasis role="bold">Log control at server startup.</emphasis>
         The <option>--log-output</option> option specifies the
         destination for log output, if logging is enabled, but the
         option does not in itself enable the logs. The syntax for this

@@ -12663,42 +12664,34 @@
         <listitem>
           <para>
             If <option>--log-output</option> is omitted or given without
-            a value, the effect is the same as
-            <option>--log-output=FILE</option>. That is, the file
-            destination is selected. (For MySQL 5.1.6 through 5.1.20,
-            the default is the table destination.)
+            a value, the default is <literal>FILE</literal>. (For MySQL
+            5.1.6 through 5.1.20, the default is
+            <literal>TABLE</literal>.)
           </para>
         </listitem>
 
-        <listitem>
-          <para>
-            If <option>--log-output</option> option also sets the value
-            of the global <literal>log_output</literal> system variable,
-            which can be modified at runtime to change the logging
-            destination for the server while it executes.
-          </para>
-        </listitem>
-
       </itemizedlist>
 
       <para>
         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
+        destinations. <option>--general_log</option> takes an optional
+        argument of 1 or 0 to enable or disable the log. 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
+        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.
+        selected. Prior to MySQL 5.1.29, the <option>--log</option> and
+        <option>--log-slow-queries</option> options 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>

@@ -12742,14 +12735,23 @@
       </itemizedlist>
 
       <para>
-        Several system variables are associated with log tables and
-        files:
+        <emphasis role="bold">Log control at runtime.</emphasis> Several
+        system variables are associated with log tables and files and
+        enable runtime control over logging:
       </para>
 
       <itemizedlist>
 
         <listitem>
           <para>
+            The global <literal>log_output</literal> system variable
+            indicates the current logging destination. It can be
+            modified at runtime to change the destination.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
             The global <literal>general_log</literal> and
             <literal>slow_query_log</literal> variables indicate whether
             the general query log and slow query log are enabled

@@ -13154,11 +13156,12 @@
         option, and optionally use <option>--log-output</option> to
         specify the log destination (as described in
         <xref linkend="log-tables"/>). As of MySQL 5.1.29,
-        <option>--log</option> and <option>-l</option> are
deprecated.
+        <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.
+        to specify a log filename. <option>--general_log</option> takes
+        an optional argument of 1 or 0 to enable or disable the log.
       </para>
 
       <para>

@@ -13172,7 +13175,7 @@
 
       <para>
         When <option>--log</option> or <option>-l</option> is
specified,
-        the <option>--general-log</option> option also may be given as
+        the <option>--general_log</option> option also may be given as
         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

@@ -13180,9 +13183,9 @@
       </para>
 
       <para>
-        The global <literal>general_log</literal> and
-        <literal>general_log_file</literal> system variables can be set
-        at runtime to control logging to the general query log. Set
+        For runtime control of the general query log, use the global
+        <literal>general_log</literal> and
+        <literal>general_log_file</literal> system variables. 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 +13196,14 @@
       <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. 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 you
+        enable the log, the server opens the 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. If the destination is <literal>NONE</literal>, no
+        queries are 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>

@@ -14817,11 +14823,13 @@
         option, and optionally use <option>--log-output</option> to
         specify the log destination (as described in
         <xref linkend="log-tables"/>). As of MySQL 5.1.29,
-        <option>--log-slow-queries</option> is deprecated. Use
+        <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.
+        to specify a log filename. <option>--slow_query_log</option>
+        takes an optional argument of 1 or 0 to enable or disable the
+        log.
       </para>
 
       <para>

@@ -14834,18 +14842,18 @@
       </para>
 
       <para>
-        When <option>--log-slow-queries</option> is specified, the
-        <option>--slow-query-log</option> option also may be given as of
-        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
+        When <option>--log-slow-queries</option> is specified,
+        <option>--slow_query_log</option> also may be given as of 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.
       </para>
 
       <para>
-        The global <literal>slow_query_log</literal> and
-        <literal>slow_query_log_file</literal> system variables can be
-        set at runtime to control logging to the slow query log. Set
+        For runtime control of the general query log, use the global
+        <literal>slow_query_log</literal> and
+        <literal>slow_query_log_file</literal> system variables. 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

@@ -14857,11 +14865,14 @@
       <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>.
+        option or <literal>log_output</literal> system variable. If you
+        enable the log, the server opens the 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. If the destination is <literal>NONE</literal>, no
+        queries are 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>


Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml	2008-10-23 04:49:49 UTC (rev 12136)
+++ trunk/refman-6.0/dba-core.xml	2008-10-23 16:17:33 UTC (rev 12137)
Changed blocks: 10, Lines Added: 60, Lines Deleted: 50; 10651 bytes

@@ -12614,6 +12614,7 @@
       </para>
 
       <para>
+        <emphasis role="bold">Log control at server startup.</emphasis>
         The <option>--log-output</option> option specifies the
         destination for log output, if logging is enabled, but the
         option does not in itself enable the logs. The syntax for this

@@ -12638,41 +12639,32 @@
         <listitem>
           <para>
             If <option>--log-output</option> is omitted or given without
-            a value, the effect is the same as
-            <option>--log-output=FILE</option>. That is, the file
-            destination is selected.
+            a value, the default is <literal>FILE</literal>.
           </para>
         </listitem>
 
-        <listitem>
-          <para>
-            If <option>--log-output</option> option also sets the value
-            of the global <literal>log_output</literal> system variable,
-            which can be modified at runtime to change the logging
-            destination for the server while it executes.
-          </para>
-        </listitem>
-
       </itemizedlist>
 
       <para>
         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
+        destinations. <option>--general_log</option> takes an optional
+        argument of 1 or 0 to enable or disable the log. 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
+        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.
+        selected. Prior to MySQL 6.0.8, the <option>--log</option> and
+        <option>--log-slow-queries</option> options 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>

@@ -12716,14 +12708,23 @@
       </itemizedlist>
 
       <para>
-        Several system variables are associated with log tables and
-        files:
+        <emphasis role="bold">Log control at runtime.</emphasis> Several
+        system variables are associated with log tables and files and
+        enable runtime control over logging:
       </para>
 
       <itemizedlist>
 
         <listitem>
           <para>
+            The global <literal>log_output</literal> system variable
+            indicates the current logging destination. It can be
+            modified at runtime to change the destination.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
             The global <literal>general_log</literal> and
             <literal>slow_query_log</literal> variables indicate whether
             the general query log and slow query log are enabled

@@ -12740,11 +12741,11 @@
             the names of the general query log and slow query log files.
             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
+            (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.
+            filenames from their default values.)
           </para>
         </listitem>
 

@@ -13081,11 +13082,12 @@
         option, and optionally use <option>--log-output</option> to
         specify the log destination (as described in
         <xref linkend="log-tables"/>). As of MySQL 6.0.8,
-        <option>--log</option> and <option>-l</option> are
deprecated.
+        <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.
+        to specify a log filename. <option>--general_log</option> takes
+        an optional argument of 1 or 0 to enable or disable the log.
       </para>
 
       <para>

@@ -13099,16 +13101,16 @@
 
       <para>
         When <option>--log</option> or <option>-l</option> is
specified,
-        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.
+        <option>--general_log</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.
       </para>
 
       <para>
-        The global <literal>general_log</literal> and
-        <literal>general_log_file</literal> system variables can be set
-        at runtime to control logging to the general query log. Set
+        For runtime control of the general query log, use the global
+        <literal>general_log</literal> and
+        <literal>general_log_file</literal> system variables. 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

@@ -13119,11 +13121,14 @@
       <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. 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 you
+        enable the log, the server opens the 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. If the destination is <literal>NONE</literal>, no
+        queries are 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>

@@ -14714,11 +14719,13 @@
         option, and optionally use <option>--log-output</option> to
         specify the log destination (as described in
         <xref linkend="log-tables"/>). As of MySQL 6.0.8,
-        <option>--log-slow-queries</option> is deprecated. Use
+        <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.
+        to specify a log filename. <option>--slow_query_log</option>
+        takes an optional argument of 1 or 0 to enable or disable the
+        log.
       </para>
 
       <para>

@@ -14731,17 +14738,17 @@
       </para>
 
       <para>
-        When <option>--log-slow-queries</option> is specified, the
-        <option>--slow-query-log</option> option also may be given to
-        specify the initial slow query log state. With no argument or an
+        When <option>--log-slow-queries</option> is specified,
+        <option>--slow_query_log</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.
       </para>
 
       <para>
-        The global <literal>slow_query_log</literal> and
-        <literal>slow_query_log_file</literal> system variables can be
-        set at runtime to control logging to the slow query log. Set
+        For runtime control of the general query log, use the global
+        <literal>slow_query_log</literal> and
+        <literal>slow_query_log_file</literal> system variables. 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

@@ -14753,11 +14760,14 @@
       <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>.
+        option or <literal>log_output</literal> system variable. If you
+        enable the log, the server opens the 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. If the destination is <literal>NONE</literal>, no
+        queries are 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>


Thread
svn commit - mysqldoc@docsrva: r12137 - in trunk: . refman-5.1 refman-6.0paul.dubois23 Oct