mysql-test/r/alter_table.result:
  Add drop table that got axed in merge
mysql-test/t/alter_table.test:
  Fix merge