Author: paul
Date: 2006-03-15 01:21:27 +0100 (Wed, 15 Mar 2006)
New Revision: 1583
Log:
r8681@frost: paul | 2006-03-14 18:19:37 -0600
Fix bad merge.
Modified:
trunk/
trunk/refman-4.1/installing.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8644
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3907
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8681
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3907
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2006-03-14 21:55:52 UTC (rev 1582)
+++ trunk/refman-4.1/installing.xml 2006-03-15 00:21:27 UTC (rev 1583)
@@ -12799,6 +12799,21 @@
</para>
</listitem>
+ <listitem>
+ <para>
+ A new startup option named
+ <option>innodb_table_locks</option> was added that causes
+ <literal>LOCK TABLE</literal> to also acquire
+ <literal>InnoDB</literal> table locks. This option is
+ enabled by default. This can cause deadlocks in applications
+ that use <literal>AUTOCOMMIT=1</literal> and <literal>LOCK
+ TABLES</literal>. If you application encounters deadlocks
+ after upgrading, you may need to add
+ <literal>innodb_table_locks=0</literal> to your
+ <filename>my.cnf</filename> file.
+ </para>
+ </listitem>
+
</itemizedlist>
<para>
@@ -12900,36 +12915,6 @@
</para>
</listitem>
- <listitem>
- <para>
- A new startup option named
- <option>innodb_table_locks</option> was added that causes
- <literal>LOCK TABLE</literal> to also acquire
- <literal>InnoDB</literal> table locks. This option is
- enabled by default. This can cause deadlocks in applications
- that use <literal>AUTOCOMMIT=1</literal> and <literal>LOCK
- TABLES</literal>. If you application encounters deadlocks
- after upgrading, you may need to add
- <literal>innodb_table_locks=0</literal> to your
- <filename>my.cnf</filename> file.
- </para>
- </listitem>
-
- <listitem>
- <para>
- A new startup option named
- <option>innodb_table_locks</option> was added that causes
- <literal>LOCK TABLE</literal> to also acquire
- <literal>InnoDB</literal> table locks. This option is
- enabled by default. This can cause deadlocks in applications
- that use <literal>AUTOCOMMIT=1</literal> and <literal>LOCK
- TABLES</literal>. If you application encounters deadlocks
- after upgrading, you may need to add
- <literal>innodb_table_locks=0</literal> to your
- <filename>my.cnf</filename> file.
- </para>
- </listitem>
-
</itemizedlist>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1583 - in trunk: . refman-4.1 | paul | 15 Mar |
