database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-25327 Unexpected ER_DUP_ENTRY upon dropping PK column from system-versioned table

Browse Source 
When dropped all user key-parts we also drop key-parts of implicit system fields.
This commit is contained in:
Aleksey Midenkov
2021-04-13 23:56:49 +03:00
parent cc3105e100
commit 562bbf5212
3 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -742,3 +742,20 @@ create or replace table t1 (x int);
alter table t1 add column y timestamp(6) as row start; alter table t1 add column y timestamp(6) as row start;
ERROR HY000: Table `t1` is not system-versioned ERROR HY000: Table `t1` is not system-versioned
drop table t1; drop table t1;
#
# MDEV-25327 Unexpected ER_DUP_ENTRY upon dropping PK column from system-versioned table
#
create table t1 (pk int, a int, primary key (pk), key (a))
with system versioning;
insert into t1 values (1, 1), (2, 2);
delete from t1;
set system_versioning_alter_history= keep;
alter table t1 drop pk;
drop table t1;
create table t1 (pk int, a int, primary key (pk), key (a))
with system versioning;
insert into t1 values (1, 2), (2, 8), (3, 4), (4, 4), (5, 0);
delete from t1;
set system_versioning_alter_history= keep;
alter ignore table t1 drop pk;
drop table t1;

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

@ -630,3 +630,25 @@ create or replace table t1 (x int);
alter table t1 add column y timestamp(6) as row start; alter table t1 add column y timestamp(6) as row start;
# cleanup # cleanup
drop table t1; drop table t1;
--echo #
--echo # MDEV-25327 Unexpected ER_DUP_ENTRY upon dropping PK column from system-versioned table
--echo #
create table t1 (pk int, a int, primary key (pk), key (a))
with system versioning;
insert into t1 values (1, 1), (2, 2);
delete from t1;
set system_versioning_alter_history= keep;
alter table t1 drop pk;
# cleanup
drop table t1;
create table t1 (pk int, a int, primary key (pk), key (a))
with system versioning;
insert into t1 values (1, 2), (2, 8), (3, 4), (4, 4), (5, 0);
delete from t1;
set system_versioning_alter_history= keep;
alter ignore table t1 drop pk;
# cleanup
drop table t1;

12
sql/sql_table.cc
View File

@ -8451,7 +8451,7 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
key_parts.push_back(new (thd->mem_root) Key_part_spec(&cfield->field_name, key_parts.push_back(new (thd->mem_root) Key_part_spec(&cfield->field_name,
key_part_length, true), key_part_length, true),
thd->mem_root); thd->mem_root);
if (cfield->invisible < INVISIBLE_SYSTEM) if (!(cfield->invisible == INVISIBLE_SYSTEM && cfield->vers_sys_field()))
user_keyparts= true; user_keyparts= true;
} }
if (table->s->tmp_table == NO_TMP_TABLE) if (table->s->tmp_table == NO_TMP_TABLE)
@ -8463,6 +8463,14 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
(void) delete_statistics_for_index(thd, table, key_info, TRUE); (void) delete_statistics_for_index(thd, table, key_info, TRUE);
} }
if (!user_keyparts && key_parts.elements)
{
/*
If we dropped all user key-parts we also drop implicit system fields.
*/
key_parts.empty();
}
if (key_parts.elements) if (key_parts.elements)
{ {
KEY_CREATE_INFO key_create_info; KEY_CREATE_INFO key_create_info;
@ -8496,7 +8504,7 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
key_type= Key::PRIMARY; key_type= Key::PRIMARY;
else else
key_type= Key::UNIQUE; key_type= Key::UNIQUE;
if (dropped_key_part && user_keyparts) if (dropped_key_part)
{ {
my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), dropped_key_part); my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), dropped_key_part);
goto err; goto err;