into mysql.com:/home/ram/work/b29923/b29923.5.1 mysql-test/r/federated.result: Auto merged mysql-test/t/federated.test: Auto merged storage/federated/ha_federated.h: Auto merged
