Commit 2e20c5b0 authored by unknown's avatar unknown
Browse files

Merge trift2.:/M50/tmp_merge 

into  trift2.:/M51/merge-5.1


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
parents 6e053cc3 4c23783c

There are no changes