Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new

Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
f07838a7 · kent@mysql.com · ce6319cd · dcf3ac77 · f07838a7
Commit f07838a7 authored Apr 12, 2006 by kent@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

mysql-test/t/disabled.def mysql-test/t/disabled.def +1 -0

No files found.
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -22,6 +22,7 @@ ndb_gis                  : BUG#18600 2006-03-28 brian
 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