Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch

into  radha.local:/Users/patg/mysql-build/mysql-5.1-arch-clean


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

mysql-test/t/federated_server.test

+# WL #3031 This test tests the new servers table as well as
+# if federated can utilise the servers table
 # should work with embedded server after mysqltest is fixed
 -- source include/not_embedded.inc
 source include/federated.inc;