diff options
| author | unknown <ramil@mysql.com> | 2006-06-15 11:15:56 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2006-06-15 11:15:56 +0500 |
| commit | ef02d496a07f76a830ca7e21907df65a58ddb4d7 (patch) | |
| tree | 41d7a057f9f58401c7f9035acb0a5165fc6708a6 | |
| parent | 67b4ac95317d13b758484eaf94eec6fa576a7fda (diff) | |
| parent | 5632d02c8de3af3bfcb0395a9b3a7f80120af21a (diff) | |
| download | mariadb-git-ef02d496a07f76a830ca7e21907df65a58ddb4d7.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b15558
| -rw-r--r-- | mysql-test/r/archive.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/archive.test | 2 | ||||
| -rw-r--r-- | sql/examples/ha_archive.cc | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result index 246e96bf993..2626b439059 100644 --- 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 index f10ff0f648e..7b3ee45de5f 100644 --- 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 index ee4cad25460..55fc359348f 100644 --- 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 */ |