1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-14627 SQL: disallow ADD SYSTEM VERSIONING for system-versioned tables

Browse Source 
SQL: disallow ADD SYSTEM VERSIONING for system-versioned tables
This commit is contained in:
Eugene Kosov 2017-12-12 14:56:28 +03:00 committed by GitHub
parent 9c718de2ed
commit cb4657e3b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/suite/versioning/r/alter.result
View File

@ -497,5 +497,10 @@ set versioning_alter_history= SURVIVE;
ERROR 42000: Variable 'versioning_alter_history' can't be set to the value of 'SURVIVE'
set versioning_alter_history= DROP;
ERROR 42000: Variable 'versioning_alter_history' can't be set to the value of 'DROP'
create or replace table t (a int) with system versioning;
alter table t add system versioning;
ERROR HY000: Table `t` is already system-versioned table
alter table t add system versioning, drop system versioning;
ERROR HY000: Table `t` is already system-versioned table
drop database test;
create database test;

6
mysql-test/suite/versioning/t/alter.test
View File

@ -336,5 +336,11 @@ show create table t;
call verify_vtq;
}
create or replace table t (a int) with system versioning;
--error ER_VERS_ALREADY_VERSIONED
alter table t add system versioning;
--error ER_VERS_ALREADY_VERSIONED
alter table t add system versioning, drop system versioning;
drop database test;
create database test;

6
sql/handler.cc
View File

@ -7047,6 +7047,12 @@ bool Vers_parse_info::check_and_fix_alter(THD *thd, Alter_info *alter_info,
if (!need_check() && !share->versioned)
return false;
if (with_system_versioning && table->versioned())
{
my_error(ER_VERS_ALREADY_VERSIONED, MYF(0), table_name);
return true;
}
if (without_system_versioning)
{
if (!share->versioned)

3
sql/share/errmsg-utf8.txt
View File

@ -7925,3 +7925,6 @@ ER_VERS_TRT_IS_DISABLED
ER_VERS_DUPLICATE_ROW_START_END
eng "Duplicate ROW %s column %`s"
ER_VERS_ALREADY_VERSIONED
eng "Table %`s is already system-versioned table"