Merge 5.1 -> 5.1-engines

Disabled im_instance_conf to get autopush through

Merge 5.1 -> 5.1-engines
Disabled im_instance_conf to get autopush through
33acddb5 · istruewing@chilla.local · 06b721f1 · 33acddb5
Commit 33acddb5 authored Sep 16, 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
@@ -16,6 +16,7 @@
 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
+im_instance_conf         : BUG#20294 2006-09-16 ingo    Instance manager test im_instance_conf fails randomly
 index_merge_innodb       : BUG#22398 2006-09-15 ingo    index_merge_innodb.test fails on wrong result file
 index_merge_myisam       : BUG#22404 2006-09-15 ingo    index_merge_myisam.test fails on wrong result file
 innodb_mysql             : BUG#22405 2006-09-15 ingo    innodb_mysql.test fails on wrong result file