diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-05-17 12:59:07 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-05-17 12:59:07 +0400 |
| commit | 896c2c73a02c7e82299b00e66ee3ff5f85aa3adc (patch) | |
| tree | b51a6b87f0d2488845144be585275c8cac19a1ed /sql/slave.cc | |
| parent | 6378c95ee07cccc2f2187b2caddc4496e14827d9 (diff) | |
| parent | fba7fbbc5c7bb1d05488108a29b854ee8ef0066a (diff) | |
| download | mariadb-git-10.3-MDEV-10953.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.310.3-MDEV-10953
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 |