mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
Merge branch '10.5' into '10.6'
This commit is contained in:
commit
e3d7d5ca26
390 changed files with 3676 additions and 1815 deletions
|
|
@ -2242,6 +2242,12 @@ ha_innobase::check_if_supported_inplace_alter(
|
|||
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
|
||||
}
|
||||
|
||||
if (ha_alter_info->create_info->used_fields
|
||||
& HA_CREATE_USED_SEQUENCE) {
|
||||
ha_alter_info->unsupported_reason = "SEQUENCE";
|
||||
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
|
||||
}
|
||||
|
||||
update_thd();
|
||||
|
||||
if (!m_prebuilt->table->space) {
|
||||
|
|
@ -6496,6 +6502,8 @@ prepare_inplace_alter_table_dict(
|
|||
DBUG_ASSERT(!ctx->add_index);
|
||||
DBUG_ASSERT(!ctx->add_key_numbers);
|
||||
DBUG_ASSERT(!ctx->num_to_add_index);
|
||||
DBUG_ASSERT(!(ha_alter_info->create_info->used_fields
|
||||
& HA_CREATE_USED_SEQUENCE));
|
||||
|
||||
user_table = ctx->new_table;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue