Commit 098a1d7d authored by Eugene Kosov's avatar Eugene Kosov

MDEV-14632 Assertion `!((new_col->prtype ^ col->prtype) & ~256U)' failed in...

 MDEV-14632 Assertion `!((new_col->prtype ^ col->prtype) & ~256U)' failed in row_log_table_apply_convert_mrec

Follow up on comments.
parent 1e8eae40
...@@ -7936,5 +7936,5 @@ ER_VERS_TRUNCATE_VIEW ...@@ -7936,5 +7936,5 @@ ER_VERS_TRUNCATE_VIEW
ER_VERS_TEMPORARY ER_VERS_TEMPORARY
eng "%s prohibited for TEMPORARY tables" eng "%s prohibited for TEMPORARY tables"
ER_VERS_ONLINE_NOT_IMPLEMENTED ER_VERS_INPLACE_NOT_IMPLEMENTED
eng "Not implemented for system-versioned tables" eng "Not implemented for system-versioned tables"
...@@ -697,9 +697,9 @@ ha_innobase::check_if_supported_inplace_alter( ...@@ -697,9 +697,9 @@ ha_innobase::check_if_supported_inplace_alter(
DBUG_ENTER("check_if_supported_inplace_alter"); DBUG_ENTER("check_if_supported_inplace_alter");
if ((table->versioned(VERS_TIMESTAMP) || altered_table->versioned(VERS_TIMESTAMP)) if ((table->versioned(VERS_TIMESTAMP) || altered_table->versioned(VERS_TIMESTAMP))
&& ha_alter_info->handler_flags & INNOBASE_ALTER_REBUILD) { && innobase_need_rebuild(ha_alter_info, table)) {
ha_alter_info->unsupported_reason = ha_alter_info->unsupported_reason =
innobase_get_err_msg(ER_VERS_ONLINE_NOT_IMPLEMENTED); innobase_get_err_msg(ER_VERS_INPLACE_NOT_IMPLEMENTED);
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED); DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
} }
...@@ -1233,9 +1233,9 @@ ha_innobase::check_if_supported_inplace_alter( ...@@ -1233,9 +1233,9 @@ ha_innobase::check_if_supported_inplace_alter(
// FIXME: implement Online DDL for system-versioned tables // FIXME: implement Online DDL for system-versioned tables
if ((table->versioned(VERS_TRX_ID) || altered_table->versioned(VERS_TRX_ID)) if ((table->versioned(VERS_TRX_ID) || altered_table->versioned(VERS_TRX_ID))
&& ha_alter_info->handler_flags & INNOBASE_ALTER_REBUILD) { && innobase_need_rebuild(ha_alter_info, table)) {
ha_alter_info->unsupported_reason = ha_alter_info->unsupported_reason =
innobase_get_err_msg(ER_VERS_ONLINE_NOT_IMPLEMENTED); innobase_get_err_msg(ER_VERS_INPLACE_NOT_IMPLEMENTED);
online = false; online = false;
} }
......
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