Fix for bad merge.

mysql-test/r/archive.result

@@ -6255,35 +6255,6 @@ auto	fld1	companynr	fld3	fld4	fld5	fld6
 2	011401	37	breaking	dreaded	Steinberg	W
 3	011402	37	Romans	scholastics	jarring	
 4	011403	37	intercepted	audiology	tinily	
-INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
-create table t3 engine=archive select * from t2;
-select * from t3 where fld3='bonfire';
-auto	fld1	companynr	fld3	fld4	fld5	fld6
-1191	068504	00	bonfire	corresponds	positively	
-select count(*) from t3;
-count(*)
-1203
-rename table t3 to t4;
-select * from t4 where fld3='bonfire';
-auto	fld1	companynr	fld3	fld4	fld5	fld6
-1191	068504	00	bonfire	corresponds	positively	
-select count(*) from t4;
-count(*)
-1203
-create table t3 engine=archive select * from t2;
-select * from t3 where fld3='bonfire';
-auto	fld1	companynr	fld3	fld4	fld5	fld6
-1191	068504	00	bonfire	corresponds	positively	
-select count(*) from t3;
-count(*)
-1203
-rename table t3 to t4;
-select * from t4 where fld3='bonfire';
-auto	fld1	companynr	fld3	fld4	fld5	fld6
-1191	068504	00	bonfire	corresponds	positively	
-select count(*) from t4;
-count(*)
-1203
 DELETE FROM t2;
 SELECT * FROM t2;
 auto	fld1	companynr	fld3	fld4	fld5	fld6
@@ -7490,6 +7461,13 @@ auto	fld1	companynr	fld3	fld4	fld5	fld6
 2	011401	37	breaking	dreaded	Steinberg	W
 3	011402	37	Romans	scholastics	jarring	
 4	011403	37	intercepted	audiology	tinily	
+2	011401	37	breaking	dreaded	Steinberg	W
+3	011402	37	Romans	scholastics	jarring	
+4	011403	37	intercepted	audiology	tinily	
+1	000001	00	Omaha	teethe	neat	
+2	011401	37	breaking	dreaded	Steinberg	W
+3	011402	37	Romans	scholastics	jarring	
+4	011403	37	intercepted	audiology	tinily	
 INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W');
 INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring','');
 INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
@@ -8701,6 +8679,13 @@ auto	fld1	companynr	fld3	fld4	fld5	fld6
 2	011401	37	breaking	dreaded	Steinberg	W
 3	011402	37	Romans	scholastics	jarring	
 4	011403	37	intercepted	audiology	tinily	
+1	000001	00	Omaha	teethe	neat	
+2	011401	37	breaking	dreaded	Steinberg	W
+3	011402	37	Romans	scholastics	jarring	
+4	011403	37	intercepted	audiology	tinily	
+2	011401	37	breaking	dreaded	Steinberg	W
+3	011402	37	Romans	scholastics	jarring	
+4	011403	37	intercepted	audiology	tinily	
 TRUNCATE TABLE t2;
 SELECT * FROM t2;
 auto	fld1	companynr	fld3	fld4	fld5	fld6
@@ -9910,4 +9895,12 @@ auto	fld1	companynr	fld3	fld4	fld5	fld6
 2	011401	37	breaking	dreaded	Steinberg	W
 3	011402	37	Romans	scholastics	jarring	
 4	011403	37	intercepted	audiology	tinily	
+1	000001	00	Omaha	teethe	neat	
+2	011401	37	breaking	dreaded	Steinberg	W
+3	011402	37	Romans	scholastics	jarring	
+4	011403	37	intercepted	audiology	tinily	
+2	011401	37	breaking	dreaded	Steinberg	W
+3	011402	37	Romans	scholastics	jarring	
+4	011403	37	intercepted	audiology	tinily	
+INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
 drop table t1, t2, t4;

mysql-test/t/archive.test

@@ -1302,6 +1302,7 @@ rename table t3 to t4;
 select * from t4 where fld3='bonfire';
 select count(*) from t4;
 
+# End of 4.1 tests
 
 #
 # Test for insert after select
@@ -1326,15 +1327,6 @@ SELECT * FROM t2;
 INSERT INTO t2 VALUES (1,000001,00,'Omaha','teethe','neat','') , (2,011401,37,'breaking','dreaded','Steinberg','W') , (3,011402,37,'Romans','scholastics','jarring','') , (4,011403,37,'intercepted','audiology','tinily','');
 SELECT * FROM t2;
 
-# Just test syntax, we will never know if the out put is right or wrong
-# Must be the last test
-INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
-# 
-# Cleanup, test is over
-#
-
-# End of 4.1 tests
-
 #
 # For bug #12836
 # Delete was allowing all rows to be removed
@@ -1347,4 +1339,13 @@ SELECT * FROM t2;
 TRUNCATE TABLE t2;
 SELECT * FROM t2;
 
+
+# Just test syntax, we will never know if the out put is right or wrong
+# Must be the last test
+INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
+# 
+# Cleanup, test is over
+#
+
+
 drop table t1, t2, t4;

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);