summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2006-04-12 20:41:40 +0200
committerunknown <kent@mysql.com>2006-04-12 20:41:40 +0200
commit377fd67842192fbfcca8fc67b4710bf92ae5fec8 (patch)
treedeb3ca0c2c081245add2486cb8621581279a4d6e /mysql-test
parente0d66c3a11be8637d144cb7299ed400512012e47 (diff)
parentac376242698a4579fa69e2b13b9091b2f309fe6c (diff)
downloadmariadb-git-377fd67842192fbfcca8fc67b4710bf92ae5fec8.tar.gz
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: Auto merged
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/t/disabled.def1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index c11960564fe..1883ab27661 100644
--- 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