Merge 5.1 -> 5.1-engines

Disabled innodb_mysql to get autopush through

Merge 5.1 -> 5.1-engines
Disabled innodb_mysql to get autopush through
5483ba8d · unknown · b4f59aeb · 5483ba8d
Commit 5483ba8d authored Sep 15, 2006 by unknown
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
@@ -18,6 +18,7 @@ im_options                : Bug#20294 2006-07-24 stewart   Instance manager test
 im_daemon_life_cycle     : BUG#22379 2006-09-15 ingo    im_daemon_life_cycle.test fails on merge of 5.1 -> 5.1-engines
 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
 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