diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2021-02-05 01:52:21 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2021-03-31 21:25:33 +0300 |
| commit | af52a0e516aa044b7fcdf91b3d2a7036c6c7ae9f (patch) | |
| tree | 9c5f94b2f0d0c77fd1695ae1db0f31aabd9d17e2 /sql/sql_table.cc | |
| parent | b9d1c6574b845ddf843dd5a8e506593e74352c69 (diff) | |
| download | mariadb-git-af52a0e516aa044b7fcdf91b3d2a7036c6c7ae9f.tar.gz | |
MDEV-24690 Dropping primary key column from versioned table always fails with 1072
Exclude system-invisible key-parts from MDEV-11114 (04b288ae)
restriction.
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 61b6023c6a1..01812e039be 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -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; |