mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 03:17:20 +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ä 2023-12-18 08:59:07 +02:00
commit 4ae105a37d
66 changed files with 1029 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2118,12 +2118,16 @@ innodb_instant_alter_column_allowed_reason:
}
}
bool need_rebuild = false;
switch (ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE) {
case ALTER_OPTIONS:
if (alter_options_need_rebuild(ha_alter_info, table)) {
if ((srv_file_per_table && !m_prebuilt->table->space_id)
|| alter_options_need_rebuild(ha_alter_info, table)) {
reason_rebuild = my_get_err_msg(
ER_ALTER_OPERATION_TABLE_OPTIONS_NEED_REBUILD);
ha_alter_info->unsupported_reason = reason_rebuild;
need_rebuild= true;
break;
}
/* fall through */
@ -2235,7 +2239,7 @@ innodb_instant_alter_column_allowed_reason:
/* We should be able to do the operation in-place.
See if we can do it online (LOCK=NONE) or without rebuild. */
bool online = true, need_rebuild = false;
bool online = true;
const uint fulltext_indexes = innobase_fulltext_exist(altered_table);
/* Fix the key parts. */
@ -6045,10 +6049,6 @@ empty_table:
goto err_exit;
}
btr_set_instant(root, *index, &mtr);
mtr.commit();
mtr.start();
index->set_modified(mtr);
err = row_ins_clust_index_entry_low(
BTR_NO_LOCKING_FLAG, BTR_MODIFY_TREE, index,
index->n_uniq, entry, 0, thr);