Fix for bad merge.

mysql-test/r/archive.result:
  Updated result file
mysql-test/t/archive.test:
  Test fix. The INSERT DELAYED test must always come last.
sql/examples/ha_archive.h:
  Bad merge.

1 files changed, 1 insertions, 1 deletions

diff --git a/sql/examples/ha_archive.h b/sql/examples/ha_archive.h
index 7e8b9683aa8..e2d8aa49add 100644
--- a/sql/examples/ha_archive.h
+++ b/sql/examples/ha_archive.h
@@ -78,7 +78,7 @@ public:
   int close(void);
   int write_row(byte * buf);
   int real_write_row(byte *buf, gzFile writer);
-  int delete_row(const byte * buf);
+  int delete_all_rows();
   int rnd_init(bool scan=1);
   int rnd_next(byte *buf);
   int rnd_pos(byte * buf, byte *pos);