mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.4 into 10.5

Browse source
This commit is contained in:
Marko Mäkelä 2024-02-13 14:25:21 +02:00
commit b770633e07
28 changed files with 408 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

13
storage/innobase/handler/handler0alter.cc
View file

@ -2551,6 +2551,9 @@ cannot_create_many_fulltext_index:
online = false;
}
static constexpr const char *not_implemented
= "Not implemented for system-versioned operations";
if (ha_alter_info->handler_flags
& ALTER_ADD_NON_UNIQUE_NON_PRIM_INDEX) {
/* ADD FULLTEXT|SPATIAL INDEX requires a lock.
@ -2578,6 +2581,12 @@ cannot_create_many_fulltext_index:
goto cannot_create_many_fulltext_index;
}
if (altered_table->versioned()) {
ha_alter_info->unsupported_reason
= not_implemented;
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
}
add_fulltext = true;
if (ha_alter_info->online
&& !ha_alter_info->unsupported_reason) {
@ -2616,10 +2625,8 @@ cannot_create_many_fulltext_index:
// FIXME: implement Online DDL for system-versioned operations
if (ha_alter_info->handler_flags & INNOBASE_ALTER_VERSIONED_REBUILD) {
if (ha_alter_info->online) {
ha_alter_info->unsupported_reason =
"Not implemented for system-versioned operations";
ha_alter_info->unsupported_reason = not_implemented;
}
online = false;