Commit b65bbb2f authored by Julius Goryavsky's avatar Julius Goryavsky

MDEV-34647: small refactoring after main fix

parent 74d71687
...@@ -4747,10 +4747,12 @@ mysql_execute_command(THD *thd) ...@@ -4747,10 +4747,12 @@ mysql_execute_command(THD *thd)
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (wsrep && !first_table->view) if (wsrep && !first_table->view)
{ {
bool is_innodb= first_table->table->file->partition_ht()->db_type == DB_TYPE_INNODB; const legacy_db_type db_type= first_table->table->file->partition_ht()->db_type;
// For InnoDB we don't need to worry about anything here:
if (db_type != DB_TYPE_INNODB)
{
// For consistency check inserted table needs to be InnoDB // For consistency check inserted table needs to be InnoDB
if (!is_innodb && thd->wsrep_consistency_check != NO_CONSISTENCY_CHECK) if (thd->wsrep_consistency_check != NO_CONSISTENCY_CHECK)
{ {
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
HA_ERR_UNSUPPORTED, HA_ERR_UNSUPPORTED,
...@@ -4758,25 +4760,23 @@ mysql_execute_command(THD *thd) ...@@ -4758,25 +4760,23 @@ mysql_execute_command(THD *thd)
" for InnoDB tables."); " for InnoDB tables.");
thd->wsrep_consistency_check= NO_CONSISTENCY_CHECK; thd->wsrep_consistency_check= NO_CONSISTENCY_CHECK;
} }
/* Only TOI allowed to !InnoDB tables */ /* Only TOI allowed to !InnoDB tables */
if (!is_innodb && wsrep_OSU_method_get(thd) != WSREP_OSU_TOI) if (wsrep_OSU_method_get(thd) != WSREP_OSU_TOI)
{ {
my_error(ER_NOT_SUPPORTED_YET, MYF(0), "RSU on this table engine"); my_error(ER_NOT_SUPPORTED_YET, MYF(0), "RSU on this table engine");
break; break;
} }
// For !InnoDB we start TOI if it is not yet started and hope for the best // For !InnoDB we start TOI if it is not yet started and hope for the best
if (!is_innodb && !wsrep_toi) if (!wsrep_toi)
{ {
const legacy_db_type db_type= first_table->table->file->partition_ht()->db_type;
/* Currently we support TOI for MyISAM only. */ /* Currently we support TOI for MyISAM only. */
if (db_type == DB_TYPE_MYISAM && wsrep_replicate_myisam) if (db_type == DB_TYPE_MYISAM && wsrep_replicate_myisam)
WSREP_TO_ISOLATION_BEGIN(first_table->db.str, first_table->table_name.str, NULL); WSREP_TO_ISOLATION_BEGIN(first_table->db.str, first_table->table_name.str, NULL);
} }
} }
}
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
/* /*
Only the INSERT table should be merged. Other will be handled by Only the INSERT table should be merged. Other will be handled by
select. select.
......
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