Author: paul
Date: 2008-11-17 21:39:34 +0100 (Mon, 17 Nov 2008)
New Revision: 12501
Log:
r35775@frost: paul | 2008-11-17 14:31:32 -0500
Be more specific about use of gap locking
Modified:
trunk/refman-5.1/se-innodb-core.xml
trunk/refman-5.1/sql-syntax-transactions.xml
trunk/refman-6.0/se-innodb-core.xml
trunk/refman-6.0/sql-syntax-transactions.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:39854
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:35773
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34365
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:39854
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:35775
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34365
Modified: trunk/refman-5.1/se-innodb-core.xml
===================================================================
--- trunk/refman-5.1/se-innodb-core.xml 2008-11-17 20:13:59 UTC (rev 12500)
+++ trunk/refman-5.1/se-innodb-core.xml 2008-11-17 20:39:34 UTC (rev 12501)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 7; 2178 bytes
@@ -5064,8 +5064,9 @@
COMMITTED</literal> isolation level is used or the
<literal>innodb_locks_unsafe_for_binlog</literal> system
variable is enabled, there is no <literal>InnoDB</literal> gap
- locking except in constraint checking. Also, record locks for
- non-matching rows are released after MySQL has evaluated the
+ locking except for foreign-key constraint checking and
+ duplicate-key checking. Also, record locks for non-matching rows
+ are released after MySQL has evaluated the
<literal>WHERE</literal> condition.
</para>
@@ -5381,8 +5382,9 @@
COMMITTED</literal> isolation level is used or the
<literal>innodb_locks_unsafe_for_binlog</literal> system
variable is enabled, there is no <literal>InnoDB</literal> gap
- locking except in constraint checking. Also, record locks for
- non-matching rows are released after MySQL has evaluated the
+ locking except for foreign-key constraint checking and
+ duplicate-key checking. Also, record locks for non-matching rows
+ are released after MySQL has evaluated the
<literal>WHERE</literal> condition.
</para>
@@ -5666,9 +5668,10 @@
COMMITTED</literal> isolation level is used or the
<literal>innodb_locks_unsafe_for_binlog</literal> system
variable is enabled, there is no <literal>InnoDB</literal>
- gap locking except in constraint checking. Also, record
- locks for non-matching rows are released after MySQL has
- evaluated the <literal>WHERE</literal> condition.
+ gap locking except for foreign-key constraint checking and
+ duplicate-key checking. Also, record locks for non-matching
+ rows are released after MySQL has evaluated the
+ <literal>WHERE</literal> condition.
</para>
</listitem>
Modified: trunk/refman-5.1/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-transactions.xml 2008-11-17 20:13:59 UTC (rev 12500)
+++ trunk/refman-5.1/sql-syntax-transactions.xml 2008-11-17 20:39:34 UTC (rev 12501)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 909 bytes
@@ -1269,9 +1269,9 @@
COMMITTED</literal> isolation level is used or the
<literal>innodb_locks_unsafe_for_binlog</literal> system variable
is enabled, there is no <literal>InnoDB</literal> gap locking
- except in constraint checking. Also, record locks for non-matching
- rows are released after MySQL has evaluated the
- <literal>WHERE</literal> condition.
+ except for foreign-key constraint checking and duplicate-key
+ checking. Also, record locks for non-matching rows are released
+ after MySQL has evaluated the <literal>WHERE</literal> condition.
</para>
<para>
Modified: trunk/refman-6.0/se-innodb-core.xml
===================================================================
--- trunk/refman-6.0/se-innodb-core.xml 2008-11-17 20:13:59 UTC (rev 12500)
+++ trunk/refman-6.0/se-innodb-core.xml 2008-11-17 20:39:34 UTC (rev 12501)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 7; 2178 bytes
@@ -4931,8 +4931,9 @@
COMMITTED</literal> isolation level is used or the
<literal>innodb_locks_unsafe_for_binlog</literal> system
variable is enabled, there is no <literal>InnoDB</literal> gap
- locking except in constraint checking. Also, record locks for
- non-matching rows are released after MySQL has evaluated the
+ locking except for foreign-key constraint checking and
+ duplicate-key checking. Also, record locks for non-matching rows
+ are released after MySQL has evaluated the
<literal>WHERE</literal> condition.
</para>
@@ -5248,8 +5249,9 @@
COMMITTED</literal> isolation level is used or the
<literal>innodb_locks_unsafe_for_binlog</literal> system
variable is enabled, there is no <literal>InnoDB</literal> gap
- locking except in constraint checking. Also, record locks for
- non-matching rows are released after MySQL has evaluated the
+ locking except for foreign-key constraint checking and
+ duplicate-key checking. Also, record locks for non-matching rows
+ are released after MySQL has evaluated the
<literal>WHERE</literal> condition.
</para>
@@ -5533,9 +5535,10 @@
COMMITTED</literal> isolation level is used or the
<literal>innodb_locks_unsafe_for_binlog</literal> system
variable is enabled, there is no <literal>InnoDB</literal>
- gap locking except in constraint checking. Also, record
- locks for non-matching rows are released after MySQL has
- evaluated the <literal>WHERE</literal> condition.
+ gap locking except for foreign-key constraint checking and
+ duplicate-key checking. Also, record locks for non-matching
+ rows are released after MySQL has evaluated the
+ <literal>WHERE</literal> condition.
</para>
</listitem>
Modified: trunk/refman-6.0/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-transactions.xml 2008-11-17 20:13:59 UTC (rev 12500)
+++ trunk/refman-6.0/sql-syntax-transactions.xml 2008-11-17 20:39:34 UTC (rev 12501)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 909 bytes
@@ -1937,9 +1937,9 @@
COMMITTED</literal> isolation level is used or the
<literal>innodb_locks_unsafe_for_binlog</literal> system variable
is enabled, there is no <literal>InnoDB</literal> gap locking
- except in constraint checking. Also, record locks for non-matching
- rows are released after MySQL has evaluated the
- <literal>WHERE</literal> condition.
+ except for foreign-key constraint checking and duplicate-key
+ checking. Also, record locks for non-matching rows are released
+ after MySQL has evaluated the <literal>WHERE</literal> condition.
</para>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r12501 - in trunk: . refman-5.1 refman-6.0 | paul.dubois | 17 Nov |
