summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <igor@rurik.mysql.com>2006-06-09 15:39:10 -0700
committerunknown <igor@rurik.mysql.com>2006-06-09 15:39:10 -0700
commit1ab93b89260b96ba3f7ef6a174653157af0bdd51 (patch)
tree12f37a23af4b8743a5aca87d558b76426f9705fc
parent87b06d0720926a980ab4ba3ab345e71c360d1fa5 (diff)
parent45d01b1a8f3ba6789fb573fc3718b29bab53da6d (diff)
downloadmariadb-git-1ab93b89260b96ba3f7ef6a174653157af0bdd51.tar.gz
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1
into rurik.mysql.com:/home/igor/mysql-5.1
-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 203471ba370..96f31133e65 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -15,6 +15,7 @@
#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-06-06 monty Instance manager test im_instance_conf 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
#ndb_binlog_discover : BUG#19395 2006-04-28 tomas/knielsen mysqld does not always detect cluster shutdown