Author: paul
Date: 2008-05-22 19:02:16 +0200 (Thu, 22 May 2008)
New Revision: 10822
Log:
r31645@frost: paul | 2008-05-22 11:59:39 -0500
Note effect of innodb_lock_wait_timeout on rollback to do lock wait timeouts.
Modified:
trunk/it/refman-5.1/se-innodb-core.xml
trunk/pt/refman-5.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:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:31643
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31428
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:31645
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31428
Modified: trunk/it/refman-5.1/se-innodb-core.xml
===================================================================
--- trunk/it/refman-5.1/se-innodb-core.xml 2008-05-22 17:02:10 UTC (rev 10821)
+++ trunk/it/refman-5.1/se-innodb-core.xml 2008-05-22 17:02:16 UTC (rev 10822)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 1; 782 bytes
@@ -7026,7 +7026,10 @@
A transaction deadlock causes <literal>InnoDB</literal> to
roll back the entire transaction. In the case of a lock wait
timeout, <literal>InnoDB</literal> rolls back only the most
- recent SQL statement.
+ recent SQL statement. To have the entire transaction roll
+ back, start the server with the
+ <option>--innodb_rollback_on_timeout</option> option
+ (available as of MySQL 5.1.15).
</para>
<para>
Modified: trunk/pt/refman-5.1/se-innodb-core.xml
===================================================================
--- trunk/pt/refman-5.1/se-innodb-core.xml 2008-05-22 17:02:10 UTC (rev 10821)
+++ trunk/pt/refman-5.1/se-innodb-core.xml 2008-05-22 17:02:16 UTC (rev 10822)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 1; 782 bytes
@@ -7026,7 +7026,10 @@
A transaction deadlock causes <literal>InnoDB</literal> to
roll back the entire transaction. In the case of a lock wait
timeout, <literal>InnoDB</literal> rolls back only the most
- recent SQL statement.
+ recent SQL statement. To have the entire transaction roll
+ back, start the server with the
+ <option>--innodb_rollback_on_timeout</option> option
+ (available as of MySQL 5.1.15).
</para>
<para>
Modified: trunk/refman-5.0/se-innodb-core.xml
===================================================================
--- trunk/refman-5.0/se-innodb-core.xml 2008-05-22 17:02:10 UTC (rev 10821)
+++ trunk/refman-5.0/se-innodb-core.xml 2008-05-22 17:02:16 UTC (rev 10822)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 2; 929 bytes
@@ -6291,9 +6291,11 @@
A transaction deadlock causes <literal>InnoDB</literal> to
roll back the entire transaction. In the case of a lock wait
timeout, <literal>InnoDB</literal> also rolls back the entire
- transaction before MySQL 5.0.13; as of 5.0.13,
+ transaction before MySQL 5.0.13. As of 5.0.13,
<literal>InnoDB</literal> rolls back only the most recent SQL
- statement.
+ statement; to have the entire transaction roll back, start the
+ server with the <option>--innodb_rollback_on_timeout</option>
+ option (available as of MySQL 5.0.32).
</para>
<para>
Modified: trunk/refman-5.1/se-innodb-core.xml
===================================================================
--- trunk/refman-5.1/se-innodb-core.xml 2008-05-22 17:02:10 UTC (rev 10821)
+++ trunk/refman-5.1/se-innodb-core.xml 2008-05-22 17:02:16 UTC (rev 10822)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 1; 773 bytes
@@ -7018,7 +7018,10 @@
A transaction deadlock causes <literal>InnoDB</literal> to
roll back the entire transaction. In the case of a lock wait
timeout, <literal>InnoDB</literal> rolls back only the most
- recent SQL statement.
+ recent SQL statement. To have the entire transaction roll
+ back, start the server with the
+ <option>--innodb_rollback_on_timeout</option> option
+ (available as of MySQL 5.1.15).
</para>
<para>
Modified: trunk/refman-6.0/se-innodb-core.xml
===================================================================
--- trunk/refman-6.0/se-innodb-core.xml 2008-05-22 17:02:10 UTC (rev 10821)
+++ trunk/refman-6.0/se-innodb-core.xml 2008-05-22 17:02:16 UTC (rev 10822)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 1; 731 bytes
@@ -6890,7 +6890,9 @@
A transaction deadlock causes <literal>InnoDB</literal> to
roll back the entire transaction. In the case of a lock wait
timeout, <literal>InnoDB</literal> rolls back only the most
- recent SQL statement.
+ recent SQL statement. To have the entire transaction roll
+ back, start the server with the
+ <option>--innodb_rollback_on_timeout</option> option.
</para>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r10822 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-5.0 refman-5.1 refman-6.0 | paul | 22 May |
