bk commit into 4.1 tree (ramil:1.2486) BUG#15558

[ramil]

Below is the list of changes that have just been committed into a local
4.1 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2486 06/05/18 17:10:58 ramil@stripped +3 -0
  Fix for bug #15558: truncate doesn't clear table on archive storage engine tables.

  sql/examples/ha_archive.cc
    1.30 06/05/18 17:10:53 ramil@stripped +1 -1
    Fix for bug #15558: truncate doesn't clear table on archive storage engine tables.
      - return an error as we don't suport delete_all_rows.

  mysql-test/t/archive.test
    1.7 06/05/18 17:10:53 ramil@stripped +2 -0
    Fix for bug #15558: truncate doesn't clear table on archive storage engine tables.
      - adjusted test

  mysql-test/r/archive.result
    1.5 06/05/18 17:10:52 ramil@stripped +2 -0
    Fix for bug #15558: truncate doesn't clear table on archive storage engine tables.
      - adjusted result

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/4.1.b15558

--- 1.4/mysql-test/r/archive.result	2005-08-30 03:05:12 +05:00
+++ 1.5/mysql-test/r/archive.result	2006-05-18 17:10:52 +05:00
@@ -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	

--- 1.6/mysql-test/t/archive.test	2005-08-30 03:05:12 +05:00
+++ 1.7/mysql-test/t/archive.test	2006-05-18 17:10:53 +05:00
@@ -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;
 

--- 1.29/sql/examples/ha_archive.cc	2005-09-12 22:19:53 +05:00
+++ 1.30/sql/examples/ha_archive.cc	2006-05-18 17:10:53 +05:00
@@ -1010,6 +1010,6 @@ ha_rows ha_archive::records_in_range(uin
 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 */