diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 11:42:37 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 11:42:37 +0200 |
| commit | 2f70784c2aff3bcf67f89f4d8cd121e8f8c3355f (patch) | |
| tree | faaec8693d4aa4ba3a71c11a6143fc8d08d1fa95 /sql/slave.cc | |
| parent | 4345d9310080e6e4cbf1040263a2653f7d3d9227 (diff) | |
| parent | b6ebadaa66ee68b1880c0e10669543d1ba058c18 (diff) | |
| download | mariadb-git-2f70784c2aff3bcf67f89f4d8cd121e8f8c3355f.tar.gz | |
Merge branch '10.7' into 10.8
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 6433423705d..82d1549a33c 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3871,12 +3871,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); @@ -3905,7 +3907,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. @@ -3935,7 +3937,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()) { @@ -4517,6 +4519,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) { @@ -4525,6 +4528,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); } |