Below is the list of changes that have just been committed into a local
mysqldoc repository of jan. When jan does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet
1.3241 05/08/11 15:23:15 jan@stripped +1 -0
Added note that innodb_table_locks startup option is not available in
MySQL 5.0. Changed lock compatibility matrix.
refman/innodb.xml
1.20 05/08/11 15:23:13 jan@stripped +25 -31
Added note that innodb_table_locks startup option is not available in
MySQL 5.0. Changed lock compatibility matrix.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: jan
# Host: hundin.mysql.fi
# Root: /home/jan/mysqldoc
--- 1.19/refman/innodb.xml 2005-08-09 05:53:12 +03:00
+++ 1.20/refman/innodb.xml 2005-08-11 15:23:13 +03:00
@@ -1463,6 +1463,8 @@
InnoDB's internal table locks can cause deadlocks. You can set
<literal>innodb_table_locks=0</literal> in
<filename>my.cnf</filename> to remove that problem.
+
+ This option is not available in MySQL 5.0.
</para>
</listitem>
@@ -3592,13 +3594,12 @@
</para>
<informaltable>
- <tgroup cols="6">
+ <tgroup cols="5">
<colspec colwidth="20*"/>
<colspec colwidth="10*"/>
<colspec colwidth="10*"/>
<colspec colwidth="10*"/>
<colspec colwidth="10*"/>
- <colspec colwidth="10*"/>
<tbody>
<row>
<entry/>
@@ -3606,51 +3607,44 @@
<entry>IX</entry>
<entry>S</entry>
<entry>IS</entry>
- <entry>-</entry>
</row>
<row>
<entry>X</entry>
- <entry>N</entry>
- <entry>N</entry>
- <entry>N</entry>
- <entry>N</entry>
- <entry>Y</entry>
+ <entry>Conflict</entry>
+ <entry>Conflict</entry>
+ <entry>Conflict</entry>
+ <entry>Conflict</entry>
</row>
<row>
<entry>IX</entry>
- <entry>N</entry>
- <entry>Y</entry>
- <entry>N</entry>
- <entry>Y</entry>
- <entry>Y</entry>
+ <entry>Conflict</entry>
+ <entry>Compatible</entry>
+ <entry>Conflict</entry>
+ <entry>Compatible</entry>
</row>
<row>
<entry>S</entry>
- <entry>N</entry>
- <entry>Y</entry>
- <entry>Y</entry>
- <entry>Y</entry>
- <entry>Y</entry>
+ <entry>Conflict</entry>
+ <entry>Compatible</entry>
+ <entry>Compatible</entry>
+ <entry>Compatible</entry>
</row>
<row>
<entry>IS</entry>
- <entry>N</entry>
- <entry>Y</entry>
- <entry>Y</entry>
- <entry>Y</entry>
- <entry>Y</entry>
- </row>
- <row>
- <entry>-</entry>
- <entry>Y</entry>
- <entry>Y</entry>
- <entry>Y</entry>
- <entry>Y</entry>
- <entry>Y</entry>
+ <entry>Conflict</entry>
+ <entry>Compatible</entry>
+ <entry>Compatible</entry>
+ <entry>Compatible</entry>
</row>
</tbody>
</tgroup>
</informaltable>
+
+ <para>
+ Lock is granted to a requesting transaction if locks are compatible.
+ Lock is not granted to a requesting transaction if locks conflict.
+ Transaction waits until the conflicting lock is freed.
+ </para>
<para>
Thus, intention locks do not block anything except full table
| Thread |
|---|
| • bk commit - mysqldoc@docsrva tree (jan:1.3241) | Jan Lindstrom | 11 Aug |
