into  mysql.com:/home/mydev/mysql-5.0-bug11824


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged