List:Commits« Previous MessageNext Message »
From:john.russell Date:September 9 2010 5:18pm
Subject:svn commit - mysqldoc@docsrva: r22651 - trunk/innodb-plugin-1.1
View as plain text  
Author: jrussell
Date: 2010-09-09 19:18:48 +0200 (Thu, 09 Sep 2010)
New Revision: 22651

Log:
Earlier change to an entity value didn't catch all instances of the obsolete 'BLOCKED' keyword.


Modified:
   trunk/innodb-plugin-1.1/innodb-i-s-innodb-trx.xml


Modified: trunk/innodb-plugin-1.1/innodb-i-s-innodb-trx.xml
===================================================================
--- trunk/innodb-plugin-1.1/innodb-i-s-innodb-trx.xml	2010-09-09 16:09:52 UTC (rev 22650)
+++ trunk/innodb-plugin-1.1/innodb-i-s-innodb-trx.xml	2010-09-09 17:18:48 UTC (rev 22651)
Changed blocks: 3, Lines Added: 4, Lines Deleted: 4; 1670 bytes

@@ -33,8 +33,8 @@
       <row>
         <entry><literal>TRX_STATE</literal></entry>
         <entry>Transaction execution state. One of <literal>RUNNING</literal>,
-          <literal>BLOCKED</literal>, <literal>ROLLING_BACK</literal> or
-          <literal>COMMITTING</literal>.</entry>
+          <literal>LOCK WAIT</literal>, <literal>ROLLING_BACK</literal>
+          or <literal>COMMITTING</literal>.</entry>
       </row>
       <row>
         <entry><literal>TRX_STARTED</literal></entry>

@@ -44,7 +44,7 @@
       <row>
         <entry><literal>TRX_REQUESTED_LOCK_ID</literal></entry>
         <entry>ID of the lock the transaction is currently waiting for (if
-          <literal>TRX_STATE</literal> is <literal>BLOCKED</literal>,
+          <literal>TRX_STATE</literal> is <literal>LOCK WAIT</literal>,
           otherwise <literal>NULL</literal>). Details about the lock can
           be found by joining with <literal>INNODB_LOCKS</literal> on
           <literal>LOCK_ID</literal>.</entry>

@@ -52,7 +52,7 @@
       <row>
         <entry><literal>TRX_WAIT_STARTED</literal></entry>
         <entry>Time when the transaction started waiting on the lock (if
-          <literal>TRX_STATE</literal> is <literal>BLOCKED</literal>,
+          <literal>TRX_STATE</literal> is <literal>LOCK WAIT</literal>,
           otherwise <literal>NULL</literal>).</entry>
       </row>
       <row>


Thread
svn commit - mysqldoc@docsrva: r22651 - trunk/innodb-plugin-1.1john.russell9 Sep