diff options
| author | Nikita Malyavin <nikitamalyavin@gmail.com> | 2019-09-06 01:51:26 +0300 |
|---|---|---|
| committer | Nikita Malyavin <nikitamalyavin@gmail.com> | 2019-09-06 01:51:26 +0300 |
| commit | 44065daaf74f51088b5e84a1be17f0685b10d527 (patch) | |
| tree | eaf6165f1abd0d0dfc8427f05399908c1fe3f186 | |
| parent | 733c4e288eae280393e4ba76948e7f91140ee21e (diff) | |
| download | mariadb-git-bb-10.3-MDEV-16490.tar.gz | |
Adopt to midenok's changesbb-10.3-MDEV-16490
| -rw-r--r-- | mysql-test/suite/versioning/r/alter.result | 14 | ||||
| -rw-r--r-- | mysql-test/suite/versioning/t/alter.test | 11 | ||||
| -rw-r--r-- | sql/handler.cc | 3 |
3 files changed, 1 insertions, 27 deletions
diff --git a/mysql-test/suite/versioning/r/alter.result b/mysql-test/suite/versioning/r/alter.result index dccc0076cbe..b5d44332955 100644 --- a/mysql-test/suite/versioning/r/alter.result +++ b/mysql-test/suite/versioning/r/alter.result @@ -654,20 +654,6 @@ t CREATE TABLE `t` ( `b` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING alter table t -change column b b int without system versioning, -drop system versioning; -ERROR HY000: Table `t` is not system-versioned -alter table t -change column a a int with system versioning, -drop system versioning; -ERROR HY000: Table `t` is not system-versioned -show create table t; -Table Create Table -t CREATE TABLE `t` ( - `a` int(11) DEFAULT NULL WITHOUT SYSTEM VERSIONING, - `b` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING -alter table t change column a new_a int, drop system versioning; show create table t; diff --git a/mysql-test/suite/versioning/t/alter.test b/mysql-test/suite/versioning/t/alter.test index 645c58c7ede..735bde0614d 100644 --- a/mysql-test/suite/versioning/t/alter.test +++ b/mysql-test/suite/versioning/t/alter.test @@ -554,17 +554,6 @@ alter table t add column b int with system versioning; show create table t; ---error ER_VERS_NOT_VERSIONED -alter table t - change column b b int without system versioning, - drop system versioning; - ---error ER_VERS_NOT_VERSIONED -alter table t - change column a a int with system versioning, - drop system versioning; -show create table t; - alter table t change column a new_a int, drop system versioning; diff --git a/sql/handler.cc b/sql/handler.cc index 8a3310f3e47..26aad3951c9 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -7281,8 +7281,7 @@ bool Vers_parse_info::fix_alter_info(THD *thd, Alter_info *alter_info, if (alter_info->flags & ALTER_DROP_SYSTEM_VERSIONING) { - // Prohibit changing field versioning, when removing table versioning - if (!share->versioned || create_info->versioned()) + if (!share->versioned) { my_error(ER_VERS_NOT_VERSIONED, MYF(0), table_name); return true; |