Fix for bug #15558: truncate doesn't clear table on archive storage engine tables.

ramil@mysql.com · ramil@mysql.com · commit c583de95f8cf · 2006-05-18T17:10:58.000+05:00
diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result
@@ -2616,6 +2616,7 @@ select count(*) from t4;
 count(*)
 1203
 DELETE FROM t2;
+ERROR HY000: Table storage engine for 't2' doesn't have this option
 SELECT * FROM t2;
 auto	fld1	companynr	fld3	fld4	fld5	fld6
 1	000001	00	Omaha	teethe	neat	
@@ -5033,6 +5034,7 @@ auto	fld1	companynr	fld3	fld4	fld5	fld6
 3	011402	37	Romans	scholastics	jarring	
 4	011403	37	intercepted	audiology	tinily	
 TRUNCATE TABLE t2;
+ERROR HY000: Table storage engine for 't2' doesn't have this option
 SELECT * FROM t2;
 auto	fld1	companynr	fld3	fld4	fld5	fld6
 1	000001	00	Omaha	teethe	neat	
diff --git a/mysql-test/t/archive.test b/mysql-test/t/archive.test
@@ -1316,12 +1316,14 @@ select count(*) from t4;
 #
 # For bug #12836
 # Delete was allowing all rows to be removed
+--error 1031
 DELETE FROM t2;
 SELECT * FROM t2;
 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','');
 SELECT * FROM t2;
+--error 1031
 TRUNCATE TABLE t2;
 SELECT * FROM t2;
 
diff --git a/sql/examples/ha_archive.cc b/sql/examples/ha_archive.cc
@@ -1010,6 +1010,6 @@ ha_rows ha_archive::records_in_range(uint inx, key_range *min_key,
 int ha_archive::delete_all_rows()
 {
   DBUG_ENTER("ha_archive::delete_all_rows");
-  DBUG_RETURN(0);
+  DBUG_RETURN(HA_ERR_WRONG_COMMAND);
 }
 #endif /* HAVE_ARCHIVE_DB */

Original file line number	Diff line number	Diff line change
`@@ -1010,6 +1010,6 @@ ha_rows ha_archive::records_in_range(uint inx, key_range *min_key,`
`1010`	`1010`	`int ha_archive::delete_all_rows()`
`1011`	`1011`	`{`
`1012`	`1012`	`DBUG_ENTER("ha_archive::delete_all_rows");`
`1013`		`- DBUG_RETURN(0);`
	`1013`	`+ DBUG_RETURN(HA_ERR_WRONG_COMMAND);`
`1014`	`1014`	`}`
`1015`	`1015`	`#endif /* HAVE_ARCHIVE_DB */`