into  xiphis.org:/anubis/antony/work/p2-bug25679.3.merge-5.1


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
storage/federated/ha_federated.h:
  Auto merged
storage/federated/ha_federated.cc:
  manual merge 5.0 to 5.1