Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/50

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/51


mysql-test/r/federated.result:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/federated/ha_federated.h:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Use local (manual merge)