diff options
| author | Monty <monty@mariadb.org> | 2017-05-07 18:26:10 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-05-08 02:33:35 +0300 |
| commit | 1e04ad284c6ac0a9ce433f827bc6dbfbd6029007 (patch) | |
| tree | ff59557c55b06495d93a3420e8aac09588a87a9d /sql/slave.cc | |
| parent | 276b0c8ef03046cc210e4eeab7231cb8d9f16bac (diff) | |
| download | mariadb-git-1e04ad284c6ac0a9ce433f827bc6dbfbd6029007.tar.gz | |
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
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 3 |
1 files changed, 1 insertions, 2 deletions
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 |