Skip to content

M
MariaDB
Commit 1f8d44ed authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Block instant ALTER better with FULLTEXT INDEX

parent a1f3f1e8
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
storage/innobase/handler/handler0alter.cc
View file @ 1f8d44ed
...@@ -1241,6 +1241,7 @@ ha_innobase::check_if_supported_inplace_alter( ...@@ -1241,6 +1241,7 @@ ha_innobase::check_if_supported_inplace_alter(
const bool supports_instant = m_prebuilt->table->supports_instant() const bool supports_instant = m_prebuilt->table->supports_instant()
&& instant_alter_column_possible(ha_alter_info, table) && instant_alter_column_possible(ha_alter_info, table)
#if 1 // MDEV-17459: adjust fts_fetch_doc_from_rec() and friends; remove this #if 1 // MDEV-17459: adjust fts_fetch_doc_from_rec() and friends; remove this
&& !m_prebuilt->table->fts
&& !innobase_fulltext_exist(altered_table) && !innobase_fulltext_exist(altered_table)
&& !innobase_fulltext_exist(table) && !innobase_fulltext_exist(table)
#endif #endif
...@@ -5700,6 +5701,7 @@ prepare_inplace_alter_table_dict( ...@@ -5700,6 +5701,7 @@ prepare_inplace_alter_table_dict(
if (ctx->need_rebuild() && user_table->supports_instant() if (ctx->need_rebuild() && user_table->supports_instant()
&& instant_alter_column_possible(ha_alter_info, old_table) && instant_alter_column_possible(ha_alter_info, old_table)
#if 1 // MDEV-17459: adjust fts_fetch_doc_from_rec() and friends; remove this #if 1 // MDEV-17459: adjust fts_fetch_doc_from_rec() and friends; remove this
&& !user_table->fts
&& !innobase_fulltext_exist(altered_table) && !innobase_fulltext_exist(altered_table)
&& !innobase_fulltext_exist(old_table) && !innobase_fulltext_exist(old_table)
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7