Merge 5.1 -> 5.1-engines

Disabled im_daemon_life_cycle with permission by Calvin

Merge 5.1 -> 5.1-engines
Disabled im_daemon_life_cycle with permission by Calvin
525ff082 · istruewing@chilla.local · 22d8c89d · 525ff082
Commit 525ff082 authored Sep 15, 2006 by istruewing@chilla.local
Hide 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
@@ -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_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
+im_daemon_life_cycle     : BUG#22379 2006-09-15 ingo    im_daemon_life_cycle.test fails on merge of 5.1 -> 5.1-engines
 concurrent_innodb        : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences
 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