Commit 0e8981ef authored by Marko Mäkelä's avatar Marko Mäkelä

Cleanup: Remove redundant conditions

ha_innobase::prepare_inplace_alter_table(): Remove always-true conditions.
Near the start of the function, we would already have returned if
no ALTER TABLE operation flags were set that would require special
action from InnoDB.

It turns out that the conditions were redundant already when they were
introduced in mysql/mysql-server@241387a2b6b61fb8a4f78dc4ad0aaa289400c694
and in commit 068c6197.

Thanks to Nikita Malyavin for noticing this.
parent 9b8e207c
...@@ -5506,11 +5506,7 @@ ha_innobase::prepare_inplace_alter_table( ...@@ -5506,11 +5506,7 @@ ha_innobase::prepare_inplace_alter_table(
ha_alter_info->key_count)) { ha_alter_info->key_count)) {
err_exit_no_heap: err_exit_no_heap:
DBUG_ASSERT(m_prebuilt->trx->dict_operation_lock_mode == 0); DBUG_ASSERT(m_prebuilt->trx->dict_operation_lock_mode == 0);
if (ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE) { online_retry_drop_indexes(m_prebuilt->table, m_user_thd);
online_retry_drop_indexes(
m_prebuilt->table, m_user_thd);
}
DBUG_RETURN(true); DBUG_RETURN(true);
} }
...@@ -5969,12 +5965,7 @@ ha_innobase::prepare_inplace_alter_table( ...@@ -5969,12 +5965,7 @@ ha_innobase::prepare_inplace_alter_table(
} }
DBUG_ASSERT(m_prebuilt->trx->dict_operation_lock_mode == 0); DBUG_ASSERT(m_prebuilt->trx->dict_operation_lock_mode == 0);
if (ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE) { online_retry_drop_indexes(m_prebuilt->table, m_user_thd);
online_retry_drop_indexes(
m_prebuilt->table, m_user_thd);
}
if ((ha_alter_info->handler_flags if ((ha_alter_info->handler_flags
& Alter_inplace_info::DROP_VIRTUAL_COLUMN) & Alter_inplace_info::DROP_VIRTUAL_COLUMN)
......
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