bk commit into 5.1 tree (kent:1.2336)

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2336 06/04/12 20:41:40 kent@stripped +1 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
  into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

  mysql-test/t/disabled.def
    1.127 06/04/12 20:41:34 kent@stripped +0 -0
    Auto merged

# 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:	kent
# Host:	c-584072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-new/RESYNC

--- 1.126/mysql-test/t/disabled.def	2006-04-12 20:19:32 +02:00
+++ 1.127/mysql-test/t/disabled.def	2006-04-12 20:41:34 +02:00
@@ -22,6 +22,7 @@
 ndb_load                 : BUG#17233 2006-02-16 jmiller
 partition_03ndb          : BUG#16385 2006-03-24 mikael
 ps_7ndb                  : BUG#18950 2006-02-16 jmiller Dbug assert in RBR mode when executing test suite
+rpl_deadlock_innodb      : BUG#16920 2006-04-12 kent    fails in show slave status (randomly)
 rpl_ndb_dd_basic         : BUG#18569 2006-03-28 brian
 rpl_row_basic_7ndb       : BUG#18923 2006-04-09 brian
 rpl_ndb_dd_advance       : BUG#18924 2006-04-09 brian