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

MDEV-24690 Dropping primary key column from versioned table always fails with 1072

Browse Source 
Exclude system-invisible key-parts from MDEV-11114 (04b288ae)
restriction.
This commit is contained in:
Aleksey Midenkov
2021-02-05 01:52:21 +03:00
parent b9d1c6574b
commit af52a0e516
3 changed files with 75 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_table.cc
View File

@ -8375,6 +8375,7 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
}
const char *dropped_key_part= NULL;
bool user_keyparts= false; // some user-defined keyparts left
KEY_PART_INFO *key_part= key_info->key_part;
key_parts.empty();
bool delete_index_stat= FALSE;
@ -8450,6 +8451,8 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
key_parts.push_back(new (thd->mem_root) Key_part_spec(&cfield->field_name,
key_part_length, true),
thd->mem_root);
if (cfield->invisible < INVISIBLE_SYSTEM)
user_keyparts= true;
}
if (table->s->tmp_table == NO_TMP_TABLE)
{
@ -8493,7 +8496,7 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
key_type= Key::PRIMARY;
else
key_type= Key::UNIQUE;
if (dropped_key_part)
if (dropped_key_part && user_keyparts)
{
my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), dropped_key_part);
goto err;