diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 13:32:38 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 13:32:38 +0200 |
commit | bb76dcbec77d31818ec7dfc0d0dc1f4b49185bc5 (patch) | |
tree | 0c288f685ac6fbc8d4bd4cdbc60bcf9942f019f7 /sql/slave.cc | |
parent | 1ac8149b83f002cd4754e1eca225560bc02b22e4 (diff) | |
parent | 55e07d9ade51e9e969f528d903509806142f4d1e (diff) | |
download | mariadb-git-bb76dcbec77d31818ec7dfc0d0dc1f4b49185bc5.tar.gz |
Merge branch '10.9' into 10.10
Diffstat (limited to 'sql/slave.cc')
-rw-r--r-- | sql/slave.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 26743e1c781..e39efcc6bbc 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3882,12 +3882,14 @@ apply_event_and_update_pos_apply(Log_event* ev, THD* thd, rpl_group_info *rgi, Relay_log_info* rli= rgi->rli; DBUG_ENTER("apply_event_and_update_pos_apply"); +#ifdef ENABLED_DEBUG_SYNC DBUG_EXECUTE_IF("inject_slave_sql_before_apply_event", { DBUG_ASSERT(!debug_sync_set_action (thd, STRING_WITH_LEN("now WAIT_FOR continue"))); DBUG_SET_INITIAL("-d,inject_slave_sql_before_apply_event"); };); +#endif if (reason == Log_event::EVENT_SKIP_NOT) exec_res= ev->apply_event(rgi); @@ -3916,7 +3918,7 @@ apply_event_and_update_pos_apply(Log_event* ev, THD* thd, rpl_group_info *rgi, } #endif -#ifndef DBUG_OFF +#ifdef DBUG_TRACE /* This only prints information to the debug trace. @@ -3946,7 +3948,7 @@ apply_event_and_update_pos_apply(Log_event* ev, THD* thd, rpl_group_info *rgi, thd->rgi_slave->get_finish_event_group_called()) DBUG_RETURN(exec_res ? 1 : 0); int error= ev->update_pos(rgi); - #ifndef DBUG_OFF +#ifdef DBUG_TRACE DBUG_PRINT("info", ("update_pos error = %d", error)); if (!rli->belongs_to_client()) { @@ -4528,6 +4530,7 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli, #ifdef WITH_WSREP wsrep_after_statement(thd); #endif /* WITH_WSREP */ +#ifdef ENABLED_DEBUG_SYNC DBUG_EXECUTE_IF( "pause_sql_thread_on_fde", if (ev && typ == FORMAT_DESCRIPTION_EVENT) { @@ -4536,6 +4539,7 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli, STRING_WITH_LEN( "now SIGNAL paused_on_fde WAIT_FOR sql_thread_continue"))); }); +#endif DBUG_RETURN(exec_res); } |