Commit 94207f1d authored by unknown's avatar unknown
Browse files

Merge 5.1 -> 5.1-engines 

Disabled index_merge_innodb to get autopush through
parent 4e2b5c07

mysql-test/t/disabled.def

+1 −0
Original line number Diff line number Diff line
@@ -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

index_merge_innodb       : BUG#22398 2006-09-15 ingo    index_merge_innodb.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