svn commit - mysqldoc@docsrva: r3633 - in trunk: . refman-4.1 refman-5.0 refman-5.1

[paul]

Author: paul
Date: 2006-10-13 18:28:45 +0200 (Fri, 13 Oct 2006)
New Revision: 3633

Log:
 r14515@polar:  paul | 2006-10-13 11:05:11 -0500
 General logging revisions.


Modified:
   trunk/refman-4.1/database-administration.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.1/database-administration.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:14474
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:10895
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:10947
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:14515
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:10895
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:10947


Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-10-13 16:21:31 UTC (rev 3632)
+++ trunk/refman-4.1/database-administration.xml	2006-10-13 16:28:45 UTC (rev 3633)
Changed blocks: 5, Lines Added: 24, Lines Deleted: 19; 4003 bytes

@@ -22213,11 +22213,10 @@
         <command>mysqld</command> writes statements to the query log in
         the order that it receives them, which might differ from the
         order in which they are executed. This logging order contrasts
-        to the update log and the binary log, which are written
-        after the query is executed, but before any locks are released.
-        (Also, the query log contains all statements, whereas the update
-        and binary logs do not contain statements that only select
-        data.)
+        to the update log and the binary log, which are written after
+        the query is executed but before any locks are released. (Also,
+        the query log contains all statements, whereas the update and
+        binary logs do not contain statements that only select data.)
       </para>
 
       <para>

@@ -22225,13 +22224,17 @@
         with the
        
<option>--log[=<replaceable>file_name</replaceable>]</option> or
         <option>-l
[<replaceable>file_name</replaceable>]</option>
-        option. If no <replaceable>file_name</replaceable> value is
-        given, the default name is
-       
<filename><replaceable>host_name</replaceable>.log</filename> in
-        the data directory.
+        option.
       </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.
+      </para>
+
+      <para>
         Server restarts and log flushing do not cause a new general
         query log file to be generated (although flushing closes and
         reopens it). On Unix, you can rename the file and create a new

@@ -22901,7 +22904,7 @@
         time to acquire the initial table locks is not counted as
         execution time. <command>mysqld</command> writes a statement to
         the slow query log after it has been executed and after all
-        locks have been released. Log order may be different from
+        locks have been released, so log order might be different from
         execution order. The minimum and default values of
         <literal>long_query_time</literal> are 1 and 10, respectively.
       </para>

@@ -22914,11 +22917,11 @@
       </para>
 
       <para>
-        If no <replaceable>file_name</replaceable> value is given, the
-        default is the name of the host machine with a suffix of
-        <literal>-slow.log</literal>. If a filename is given, but not as
-        an absolute pathname, the server writes the file in the data
-        directory.
+        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.
       </para>
 
       <para>

@@ -23012,10 +23015,12 @@
       </para>
 
       <para>
-        You can force MySQL to start using new log files by using
-        <command>mysqladmin flush-logs</command> or by using the SQL
-        statement <literal>FLUSH LOGS</literal>. If you are using MySQL
-        3.21, you must use <command>mysqladmin refresh</command>.
+        You can force MySQL to start using new log files by issuing a
+        <literal>FLUSH LOGS</literal> statement or executing
+        <command>mysqladmin flush-logs</command> or <command>mysqladmin
+        refresh</command>. See <xref linkend="flush"/>, and
+        <xref linkend="mysqladmin"/>. If you are using MySQL 3.21, you
+        must use <command>mysqladmin refresh</command>.
       </para>
 
       <para>


Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-10-13 16:21:31 UTC (rev 3632)
+++ trunk/refman-5.0/database-administration.xml	2006-10-13 16:28:45 UTC (rev 3633)
Changed blocks: 5, Lines Added: 23, Lines Deleted: 17; 3780 bytes

@@ -25552,10 +25552,10 @@
         <command>mysqld</command> writes statements to the query log in
         the order that it receives them, which might differ from the
         order in which they are executed. This logging order contrasts
-        to the binary log, for which statements are written after
-        they are executed, but before any locks are released. (Also, the
-        query log contains all statements, whereas the binary log does
-        not contain statements that only select data.)
+        to the binary log, for which statements are written after they
+        are executed but before any locks are released. (Also, the query
+        log contains all statements, whereas the binary log does not
+        contain statements that only select data.)
       </para>
 
       <para>

@@ -25563,13 +25563,17 @@
         with the
        
<option>--log[=<replaceable>file_name</replaceable>]</option> or
         <option>-l
[<replaceable>file_name</replaceable>]</option>
-        option. If no <replaceable>file_name</replaceable> value is
-        given, the default name is
-       
<filename><replaceable>host_name</replaceable>.log</filename> in
-        the data directory.
+        option.
       </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.
+      </para>
+
+      <para>
         Server restarts and log flushing do not cause a new general
         query log file to be generated (although flushing closes and
         reopens it). On Unix, you can rename the file and create a new

@@ -26159,7 +26163,7 @@
         time to acquire the initial table locks is not counted as
         execution time. <command>mysqld</command> writes a statement to
         the slow query log after it has been executed and after all
-        locks have been released. Log order may be different from
+        locks have been released, so log order might be different from
         execution order. The minimum and default values of
         <literal>long_query_time</literal> are 1 and 10, respectively.
       </para>

@@ -26172,11 +26176,11 @@
       </para>
 
       <para>
-        If no <replaceable>file_name</replaceable> value is given, the
-        default is the name of the host machine with a suffix of
-        <literal>-slow.log</literal>. If a filename is given, but not as
-        an absolute pathname, the server writes the file in the data
-        directory.
+        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.
       </para>
 
       <para>

@@ -26263,9 +26267,11 @@
       </para>
 
       <para>
-        You can force MySQL to start using new log files by using
-        <command>mysqladmin flush-logs</command> or by using the SQL
-        statement <literal>FLUSH LOGS</literal>.
+        You can force MySQL to start using new log files by issuing a
+        <literal>FLUSH LOGS</literal> statement or executing
+        <command>mysqladmin flush-logs</command> or <command>mysqladmin
+        refresh</command>. See <xref linkend="flush"/>, and
+        <xref linkend="mysqladmin"/>.
       </para>
 
       <para>


Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-10-13 16:21:31 UTC (rev 3632)
+++ trunk/refman-5.1/database-administration.xml	2006-10-13 16:28:45 UTC (rev 3633)
Changed blocks: 5, Lines Added: 27, Lines Deleted: 17; 4129 bytes

@@ -26090,10 +26090,10 @@
         <command>mysqld</command> writes statements to the query log in
         the order that it receives them, which might differ from the
         order in which they are executed. This logging order contrasts
-        to the binary log, for which statements are written after
-        they are executed, but before any locks are released. (Also, the
-        query log contains all statements, whereas the binary log does
-        not contain statements that only select data.)
+        to the binary log, for which statements are written after they
+        are executed but before any locks are released. (Also, the query
+        log contains all statements, whereas the binary log does not
+        contain statements that only select data.)
       </para>
 
       <para>

@@ -26108,10 +26108,14 @@
         log file, use the
        
<option>--log[=<replaceable>file_name</replaceable>]</option> or
         <option>-l
[<replaceable>file_name</replaceable>]</option>
-        option. If no <replaceable>file_name</replaceable> value is
-        given, the default name is
-       
<filename><replaceable>host_name</replaceable>.log</filename> in
-        the data directory. If a filename is given, but not as an
+        option.
+      </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
         absolute pathname, the server writes the file in the data
         directory.
       </para>

@@ -26743,7 +26747,7 @@
         time to acquire the initial table locks is not counted as
         execution time. <command>mysqld</command> writes a statement to
         the slow query log after it has been executed and after all
-        locks have been released. Log order may be different from
+        locks have been released, so log order might be different from
         execution order. The minimum and default values of
         <literal>long_query_time</literal> are 1 and 10, respectively.
       </para>

@@ -26758,14 +26762,18 @@
         destination is always a file. To enable the slow query log file,
         use 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
-        of <literal>-slow.log</literal>. If a filename is given, but not
-        as an absolute pathname, the server writes the file in the data
-        directory.
+        option.
       </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.
+      </para>
+
+      <para>
         If <option>--log-slow-queries</option> is given, 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

@@ -26887,9 +26895,11 @@
       </para>
 
       <para>
-        You can force MySQL to start using new log files by using
-        <command>mysqladmin flush-logs</command> or by using the SQL
-        statement <literal>FLUSH LOGS</literal>.
+        You can force MySQL to start using new log files by issuing a
+        <literal>FLUSH LOGS</literal> statement or executing
+        <command>mysqladmin flush-logs</command> or <command>mysqladmin
+        refresh</command>. See <xref linkend="flush"/>, and
+        <xref linkend="mysqladmin"/>.
       </para>
 
       <para>