sql/ha_federated.h:
  copy-paste fix
sql/sql_parse.cc:
  after-merge fix