svn commit - mysqldoc@docsrva: r7838 - in trunk: . refman-5.2

[paul]

Author: paul
Date: 2007-09-13 16:32:32 +0200 (Thu, 13 Sep 2007)
New Revision: 7838

Log:
 r24932@frost:  paul | 2007-09-13 08:29:17 -0500
 Forgot to patch 5.2 for the mutex info.


Modified:
   trunk/refman-5.2/sql-syntax.xml

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


Modified: trunk/refman-5.2/sql-syntax.xml
===================================================================
--- trunk/refman-5.2/sql-syntax.xml	2007-09-13 14:32:16 UTC (rev 7837)
+++ trunk/refman-5.2/sql-syntax.xml	2007-09-13 14:32:32 UTC (rev 7838)
Changed blocks: 3, Lines Added: 18, Lines Deleted: 15; 2519 bytes

@@ -20376,8 +20376,8 @@
 
         <para>
           <literal>SHOW ENGINE INNODB MUTEX</literal> displays
-          <literal>InnoDB</literal> mutex statistics. The output fields
-          are:
+          <literal>InnoDB</literal> mutex statistics. The statement
+          displays the following fields:
         </para>
 
         <itemizedlist>

@@ -20398,19 +20398,10 @@
             </para>
 
             <para>
-              The mutex name and the source file where it is
-              implemented. Example:
-              <literal>&amp;pool-&gt;mutex:mem0pool.c</literal>
+              The source file where the mutex is implemented, and the
+              line number in the file where the mutex is created. The
+              line number may change depending on your version of MySQL.
             </para>
-
-            <para>
-              The mutex name indicates its purpose. For example, the
-              <literal>log_sys</literal> mutex is used by the
-              <literal>InnoDB</literal> logging subsystem and indicates
-              how intensive logging activity is. The
-              <literal>buf_pool</literal> mutex protects the
-              <literal>InnoDB</literal> buffer pool.
-            </para>
           </listitem>
 
           <listitem>

@@ -20419,7 +20410,19 @@
             </para>
 
             <para>
-              The mutex status. The fields contains several values:
+              The mutex status. This field displays several values if
+              <literal>UNIV_DEBUG</literal> was defined at MySQL
+              compilation time (for example, in
+              <filename>include/univ.h</filename> in the
+              <literal>InnoDB</literal> part of the MySQL source tree).
+              If <literal>UNIV_DEBUG</literal> was not defined, the
+              statement displays only the <literal>os_waits</literal>
+              value. In the latter case (without UNIV_DEBUG), the
+              information on which the output is based is insufficient
+              to distinguish regular mutexes and mutexes that protect
+              rw-locks (which allow multiple readers or a single
+              writer). Consequently, the output may appear to contain
+              multiple rows for the same mutex.
             </para>
 
             <itemizedlist>