Commit 4c23783c authored by unknown's avatar unknown

Merge knielsen@knielsen.mysql.internal:/usr/local/mysql/tmp-5.0

into  mysql.com:/data0/knielsen/tmp-5.0


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
parents 9ee8e42d d0201bc3
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment