diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-10 13:01:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-10 13:01:42 +0200 |
| commit | 9b1824dcd2564c803e58d02ac63b49ec68bd60d2 (patch) | |
| tree | beef3faf3e0e6b8264014a0cfb735d4a32be6cbc /sql/slave.cc | |
| parent | 92a13148e80c30422ae5460032169cbe1946fa6d (diff) | |
| parent | ff579bc814551026a3271fac274f560cef3f523f (diff) | |
| download | mariadb-git-9b1824dcd2564c803e58d02ac63b49ec68bd60d2.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index b90fd47af83..713a668bfe8 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4021,10 +4021,10 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli, DBUG_RETURN(1); #ifdef WITH_WSREP - mysql_mutex_lock(&thd->LOCK_wsrep_thd); + mysql_mutex_lock(&thd->LOCK_thd_data); if (thd->wsrep_conflict_state == NO_CONFLICT) { - mysql_mutex_unlock(&thd->LOCK_wsrep_thd); + mysql_mutex_unlock(&thd->LOCK_thd_data); #endif /* WITH_WSREP */ if (slave_trans_retries) { @@ -4101,7 +4101,7 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli, #ifdef WITH_WSREP } else - mysql_mutex_unlock(&thd->LOCK_wsrep_thd); + mysql_mutex_unlock(&thd->LOCK_thd_data); #endif /* WITH_WSREP */ thread_safe_increment64(&rli->executed_entries); |