mysql-test/t/disabled.def:
  Removed reference to  failed test.
sql/ha_archive.cc:
  This fixes the optimize problem introduced in a bad merge.