bk commit - mysqldoc@docsrva tree (jan:1.3354)

[Jan Lindstrom]

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.3354 05/08/22 12:01:10 jan@stripped +1 -0
  Fix a error on lock type compatibility matrix (Bug #12667). S-lock 
  is not compatible with a table level IX-lock.

  refman/innodb.xml
    1.28 05/08/22 12:01:08 jan@stripped +1 -1
    Fix a error on lock type compatibility matrix (Bug #12667). S-lock 
    is not compatible with a table level IX-lock.

# 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.27/refman/innodb.xml	2005-08-16 05:15:37 +03:00
+++ 1.28/refman/innodb.xml	2005-08-22 12:01:08 +03:00
@@ -3604,7 +3604,7 @@
             <row>
               <entry>S</entry>
               <entry>Conflict</entry>
-              <entry>Compatible</entry>
+              <entry>Conflict</entry>
               <entry>Compatible</entry>
               <entry>Compatible</entry>
             </row>