Author: paul
Date: 2007-12-17 18:39:42 +0100 (Mon, 17 Dec 2007)
New Revision: 9354
Log:
r28209@frost: paul | 2007-12-17 10:45:45 -0600
Revised innodb_lock_wait_timeout wording. (Per Heikki)
(Bug#32005)
Modified:
trunk/refman-4.1/se-innodb-core.xml
trunk/refman-5.0/se-innodb-core.xml
trunk/refman-5.1/se-innodb-core.xml
trunk/refman-6.0/se-innodb-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:34357
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:28208
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:22582
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:34357
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:28209
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:22582
Modified: trunk/refman-4.1/se-innodb-core.xml
===================================================================
--- trunk/refman-4.1/se-innodb-core.xml 2007-12-17 17:39:30 UTC (rev 9353)
+++ trunk/refman-4.1/se-innodb-core.xml 2007-12-17 17:39:42 UTC (rev 9354)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 9; 1296 bytes
@@ -1431,15 +1431,10 @@
transaction may wait for a lock before being rolled back.
<literal>InnoDB</literal> automatically detects transaction
deadlocks in its own lock table and rolls back the
- transaction. Beginning with MySQL 4.0.20 and 4.1.2,
- <literal>InnoDB</literal> notices locks set using the
- <literal>LOCK TABLES</literal> statement. Before that, if you
- use the <literal>LOCK TABLES</literal> statement, or other
- transaction-safe storage engines than
- <literal>InnoDB</literal> in the same transaction, a deadlock
- may arise that <literal>InnoDB</literal> cannot notice. In
- cases like this, the timeout is useful to resolve the
- situation. The default is 50 seconds.
+ transaction. The default is 50 seconds. A lock wait for a
+ MySQL table lock does not happen inside
+ <literal>InnoDB</literal>, and this timeout does not apply to
+ that wait.
</para>
</listitem>
Modified: trunk/refman-5.0/se-innodb-core.xml
===================================================================
--- trunk/refman-5.0/se-innodb-core.xml 2007-12-17 17:39:30 UTC (rev 9353)
+++ trunk/refman-5.0/se-innodb-core.xml 2007-12-17 17:39:42 UTC (rev 9354)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 3; 893 bytes
@@ -1380,9 +1380,10 @@
transaction may wait for a lock before being rolled back.
<literal>InnoDB</literal> automatically detects transaction
deadlocks in its own lock table and rolls back the
- transaction. <literal>InnoDB</literal> notices locks set using
- the <literal>LOCK TABLES</literal> statement. The default is
- 50 seconds.
+ transaction. The default is 50 seconds. A lock wait for a
+ MySQL table lock does not happen inside
+ <literal>InnoDB</literal>, and this timeout does not apply to
+ that wait.
</para>
</listitem>
Modified: trunk/refman-5.1/se-innodb-core.xml
===================================================================
--- trunk/refman-5.1/se-innodb-core.xml 2007-12-17 17:39:30 UTC (rev 9353)
+++ trunk/refman-5.1/se-innodb-core.xml 2007-12-17 17:39:42 UTC (rev 9354)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 3; 893 bytes
@@ -1395,9 +1395,10 @@
transaction may wait for a lock before being rolled back.
<literal>InnoDB</literal> automatically detects transaction
deadlocks in its own lock table and rolls back the
- transaction. <literal>InnoDB</literal> notices locks set using
- the <literal>LOCK TABLES</literal> statement. The default is
- 50 seconds.
+ transaction. The default is 50 seconds. A lock wait for a
+ MySQL table lock does not happen inside
+ <literal>InnoDB</literal>, and this timeout does not apply to
+ that wait.
</para>
</listitem>
Modified: trunk/refman-6.0/se-innodb-core.xml
===================================================================
--- trunk/refman-6.0/se-innodb-core.xml 2007-12-17 17:39:30 UTC (rev 9353)
+++ trunk/refman-6.0/se-innodb-core.xml 2007-12-17 17:39:42 UTC (rev 9354)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 3; 893 bytes
@@ -1393,9 +1393,10 @@
transaction may wait for a lock before being rolled back.
<literal>InnoDB</literal> automatically detects transaction
deadlocks in its own lock table and rolls back the
- transaction. <literal>InnoDB</literal> notices locks set using
- the <literal>LOCK TABLES</literal> statement. The default is
- 50 seconds.
+ transaction. The default is 50 seconds. A lock wait for a
+ MySQL table lock does not happen inside
+ <literal>InnoDB</literal>, and this timeout does not apply to
+ that wait.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r9354 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 17 Dec |
