From 1e04ad284c6ac0a9ce433f827bc6dbfbd6029007 Mon Sep 17 00:00:00 2001 From: Monty Date: Sun, 7 May 2017 18:26:10 +0300 Subject: Fixed compiler warnings and warnings from build.tags Other things - Ensure that ut_d() is set to EXPR if ut_ad() is DEBUG_ASSERT() If not, we will get a crash in purge_sys_t::~purge_sys_t() as this ut_ad() code expect's that the ut_d() codes has been executed --- sql/slave.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sql/slave.cc') diff --git a/sql/slave.cc b/sql/slave.cc index b28bc1d8dc5..b2cbac44c1b 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3728,8 +3728,7 @@ int apply_event_and_update_pos_for_parallel(Log_event* ev, THD* thd, rpl_group_info *rgi) { - Relay_log_info* rli= rgi->rli; - mysql_mutex_assert_not_owner(&rli->data_lock); + mysql_mutex_assert_not_owner(&rgi->rli->data_lock); int reason= apply_event_and_update_pos_setup(ev, thd, rgi); /* In parallel replication, sql_slave_skip_counter is handled in the SQL -- cgit v1.2.1