bk commit - mysqldoc tree (jan:1.2874)

[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.2874 05/04/18 13:16:05 jan@stripped +1 -0
  Documentation for a bug fix in 4.1.12 (Bug #7975).

  Docs/manual.texi
    1.2706 05/04/18 13:15:59 jan@stripped +4 -0
    Documentation for a bug fix (Bug #7975).

# 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.2705/Docs/manual.texi	Mon Apr 18 10:36:54 2005
+++ 1.2706/Docs/manual.texi	Mon Apr 18 13:15:59 2005
@@ -100680,6 +100680,10 @@
 @item
 @code{InnoDB}: Prevent @code{ALTER TABLE} from changing the storage engine
 if there are foreign key constraints on the table.  (Bug #5574, Bug #5670)
+@item
+@code{InnoDB}: Fixed a deadlock without any locking, simple select and
+update. (Bug #7975) @code{InnoDB} now takes an exclusive lock 
+when @code{INSERT ON DUPLICATE KEY UPDATE} is checking duplicate keys.
 
 @end itemize