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

into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge

mysql-test/t/disabled.def

@@ -53,3 +53,4 @@ im_options_set       : Bug#20294: Instance manager tests fail randomly
 im_options_unset     : Bug#20294: Instance manager tests fail randomly
 mysql_upgrade        : Bug#28560 test links to /usr/local/mysql/lib libraries, causes non-determinism and failures on ABI breakage
 ndb_dd_sql_features  : Bug#29102 ndb_dd_sql_features fails in pushbuild
+federated_innodb     : Bug#29522 failed assertion in binlog_close_connection()