svn commit - mysqldoc@oter02: r25614 - trunk/innodb-1.1

[john.russell]

Author: jdrussel
Date: 2011-03-30 00:12:20 +0200 (Wed, 30 Mar 2011)
New Revision: 25614

Log:
Clean up discussion of one InnoDB option.
Got some advice about how/when to use it via
discussion with InnoDB team, but that probably is
better to go in the Ref Man (option reference, and
maybe Optimization chapter).


Modified:
   trunk/innodb-1.1/innodb-other-changes.xml


Modified: trunk/innodb-1.1/innodb-other-changes.xml
===================================================================
--- trunk/innodb-1.1/innodb-other-changes.xml	2011-03-29 21:25:42 UTC (rev 25613)
+++ trunk/innodb-1.1/innodb-other-changes.xml	2011-03-29 22:12:20 UTC (rev 25614)
Changed blocks: 2, Lines Added: 23, Lines Deleted: 24; 3049 bytes

@@ -247,35 +247,27 @@
       </indexterm>
 
       <para>
-        When a transaction is waiting for a resource, it will wait for
-        the resource to become free, or stop waiting and return with the
-        error
-
-<programlisting
-      >ERROR HY000: Lock wait timeout exceeded;<!--
-      --> try restarting transaction</programlisting>
-
-        The length of time a transaction will wait for a resource before
-        <quote>giving up</quote> is determined by the value of the
-        configuration parameter
+        The length of time a transaction waits for a resource, before
+        giving up and rolling back the statement, is determined by the
+        value of the configuration parameter
         <literal
 				role="sysvar">innodb_lock_wait_timeout</literal>.
-        The default setting for this parameter is 50 seconds. The
-        minimum setting is 1 second, and values above 100,000,000
-        disable the timeout, so a transaction will wait
-        <quote>forever</quote>. Following a timeout, the SQL statement
-        that was executing will be rolled back. (In MySQL 5.0.12 and
-        earlier, the transaction rolled back.) The user application may
-        try the statement again (usually after waiting for a while), or
-        rollback the entire transaction and restart.
+        (In MySQL 5.0.12 and earlier, the entire transaction was rolled
+        back, not just the statement.) Your application can try the
+        statement again (usually after waiting for a while), or roll
+        back the entire transaction and restart.
       </para>
 
       <para>
-        Before InnoDB 1.0.2, the only way to set this parameter was in
-        the MySQL option file (<literal>my.cnf</literal> or
-        <literal>my.ini</literal>), and changing it required shutting
-        down and restarting the server. Beginning with InnoDB 1.0.2, the
-        configuration parameter
+        The error returned when the timeout period is exceeded is:
+      </para>
+
+<programlisting>
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+</programlisting>
+
+      <para>
+        In MySQL 5.5 and higher, the configuration parameter
         <literal role="sysvar">innodb_lock_wait_timeout</literal> can be
         set at runtime with the <literal>SET GLOBAL</literal> or
         <literal>SET SESSION</literal> statement. Changing the

@@ -287,6 +279,13 @@
         affects only that client.
       </para>
 
+      <para>
+        In MySQL 5.1 and earlier, the only way to set this parameter was
+        in the MySQL option file (<literal>my.cnf</literal> or
+        <literal>my.ini</literal>), and changing it required shutting
+        down and restarting the server.
+      </para>
+
     </section>
 
     <section id="innodb-other-changes-innodb_adaptive_hash_index">