revision-id: 370718ed0adbd8c00bc6dc7aed598e03d68a68e9 (mariadb-10.3.6-114-g370718ed0ad) parent(s): f1246eb89e5750788caac4ee1f94c67dfb1c2208 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-05-06 22:16:04 +0200 message: postreview --- mysql-test/suite/sql_sequence/other.result | 6 ++++++ mysql-test/suite/sql_sequence/other.test | 6 ++++++ sql/ha_sequence.h | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/sql_sequence/other.result b/mysql-test/suite/sql_sequence/other.result index bfb7670e32e..c3c9f84a25e 100644 --- a/mysql-test/suite/sql_sequence/other.result +++ b/mysql-test/suite/sql_sequence/other.result @@ -199,7 +199,13 @@ drop sequence s1; # sequence in multi-table format # CREATE SEQUENCE s; +CREATE table t1 (a int); +insert into t1 values (1),(2); DELETE s FROM s; ERROR HY000: Storage engine SEQUENCE of the table `test`.`s` doesn't have this option +delete t1,s from s,t1; +ERROR HY000: Storage engine SEQUENCE of the table `test`.`s` doesn't have this option +delete s,t1 from t1,s; +ERROR HY000: Storage engine SEQUENCE of the table `test`.`s` doesn't have this option DROP SEQUENCE s; # End of 10.3 tests diff --git a/mysql-test/suite/sql_sequence/other.test b/mysql-test/suite/sql_sequence/other.test index d19d47e8919..668485e558f 100644 --- a/mysql-test/suite/sql_sequence/other.test +++ b/mysql-test/suite/sql_sequence/other.test @@ -167,8 +167,14 @@ drop sequence s1; --echo # sequence in multi-table format --echo # CREATE SEQUENCE s; +CREATE table t1 (a int); +insert into t1 values (1),(2); --error ER_ILLEGAL_HA DELETE s FROM s; +--error ER_ILLEGAL_HA +delete t1,s from s,t1; +--error ER_ILLEGAL_HA +delete s,t1 from t1,s; DROP SEQUENCE s; diff --git a/sql/ha_sequence.h b/sql/ha_sequence.h index b3789914e18..fd9da05b591 100644 --- a/sql/ha_sequence.h +++ b/sql/ha_sequence.h @@ -123,7 +123,7 @@ class ha_sequence :public handler return error; } void position(const uchar *record) - { } + { return file->position(record); } const char *table_type() const { return file->table_type(); } ulong index_flags(uint inx, uint part, bool all_parts) const