Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1

into mysql.com:/home/marty/MySQL/mysql-5.1

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/marty/MySQL/mysql-5.1
7704d973 · mskold@linux.site · 7fdf6f16 · 5ce56c1c · 7704d973
Commit 7704d973 authored Jun 21, 2006 by mskold@linux.site
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

mysql-test/t/disabled.def mysql-test/t/disabled.def +3 -3

No files found.
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -13,9 +13,9 @@
 #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-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
+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