Commit ef02d496 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  mysql.com:/usr/home/ram/work/4.1.b15558
parents 67b4ac95 5632d02c

mysql-test/r/archive.result

+2 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/t/archive.test

+2 −0
Original line number Diff line number Diff line
@@ -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;

sql/examples/ha_archive.cc

+1 −1
Original line number Diff line number Diff line
@@ -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 */