summaryrefslogtreecommitdiff
path: root/mysql-test/t/disabled.def
diff options
context:
space:
mode:
authorunknown <anozdrin/alik@alik.>2006-09-01 22:24:51 +0400
committerunknown <anozdrin/alik@alik.>2006-09-01 22:24:51 +0400
commitd57163fcf84d6fc0e8cad5fdbbe5c14274eb694c (patch)
tree6c79675fb5c43dc0b8e286f8490c7d42e74fe522 /mysql-test/t/disabled.def
parent16de51bc0783c8f97fe42e293932e93091c7100f (diff)
parentf5e8d19f752f6bc71f3e22923b1a99fb6119d6e1 (diff)
downloadmariadb-git-d57163fcf84d6fc0e8cad5fdbbe5c14274eb694c.tar.gz
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-tree
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged mysql-test/t/disabled.def: SCCS merged
Diffstat (limited to 'mysql-test/t/disabled.def')
-rw-r--r--mysql-test/t/disabled.def3
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 81773dbf999..f37ceb10e37 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -13,8 +13,7 @@
#events_stress : BUG#17619 2006-02-21 andrey Race conditions
#events : BUG#17619 2006-02-21 andrey Race conditions
#events_scheduling : BUG#19170 2006-04-26 andrey Test case of 19170 fails on some platforms. Has to be checked.
-im_instance_conf : Bug#20294 2006-06-06 monty Instance manager test im_instance_conf fails randomly
-im_options : Bug#20294 2006-07-24 stewart Instance manager test im_instance_conf fails randomly
+im_options : Bug#20294 2006-07-24 stewart Instance manager test im_options fails randomly
#im_life_cycle : Bug#20368 2006-06-10 alik im_life_cycle test fails
ndb_autodiscover : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
ndb_autodiscover2 : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog