diff options
Diffstat (limited to 'sql/rpl_mi.cc')
| -rw-r--r-- | sql/rpl_mi.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/rpl_mi.cc b/sql/rpl_mi.cc index 55a66719e56..6f659aa12ad 100644 --- a/sql/rpl_mi.cc +++ b/sql/rpl_mi.cc @@ -42,7 +42,8 @@ Master_info::Master_info(LEX_CSTRING *connection_name_arg, using_gtid(USE_GTID_NO), events_queued_since_last_gtid(0), gtid_reconnect_event_skip_count(0), gtid_event_seen(false), in_start_all_slaves(0), in_stop_all_slaves(0), in_flush_all_relay_logs(0), - users(0), killed(0) + users(0), killed(0), + total_ddl_groups(0), total_non_trans_groups(0), total_trans_groups(0) { char *tmp; host[0] = 0; user[0] = 0; password[0] = 0; @@ -677,7 +678,7 @@ file '%s')", fname); mi->rli.is_relay_log_recovery= FALSE; // now change cache READ -> WRITE - must do this before flush_master_info reinit_io_cache(&mi->file, WRITE_CACHE, 0L, 0, 1); - if ((error= MY_TEST(flush_master_info(mi, TRUE, TRUE)))) + if (unlikely((error= MY_TEST(flush_master_info(mi, TRUE, TRUE))))) sql_print_error("Failed to flush master info file"); mysql_mutex_unlock(&mi->data_lock); DBUG_RETURN(error); @@ -1648,7 +1649,7 @@ bool Master_info_index::start_all_slaves(THD *thd) error= start_slave(thd, mi, 1); mi->release(); mysql_mutex_lock(&LOCK_active_mi); - if (error) + if (unlikely(error)) { my_error(ER_CANT_START_STOP_SLAVE, MYF(0), "START", @@ -1721,7 +1722,7 @@ bool Master_info_index::stop_all_slaves(THD *thd) error= stop_slave(thd, mi, 1); mi->release(); mysql_mutex_lock(&LOCK_active_mi); - if (error) + if (unlikely(error)) { my_error(ER_CANT_START_STOP_SLAVE, MYF(0), "STOP", @@ -2020,7 +2021,7 @@ bool Master_info_index::flush_all_relay_logs() mi->release(); mysql_mutex_lock(&LOCK_active_mi); - if (error) + if (unlikely(error)) { result= true; break; |