into mysql.com:/data0/knielsen/tmp-5.0 mysql-test/r/federated.result: Auto merged mysql-test/t/federated.test: Auto merged