diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-28 09:08:58 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-28 09:08:58 +0300 |
| commit | d8c6c53a0658ea8315252997f65d796b13182387 (patch) | |
| tree | 26cb3a48c75fb94307ee564185b45fd7d94f80f7 /sql/slave.cc | |
| parent | 1ad1d789815ddada89d8fb557a47a437d1ea21c2 (diff) | |
| parent | a8ded395578ccab9c256b9beee7e62d4ada08522 (diff) | |
| download | mariadb-git-d8c6c53a0658ea8315252997f65d796b13182387.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index e7aa0d4a510..5ff40d8fb25 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4198,6 +4198,8 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli, #ifdef WITH_WSREP if (wsrep_before_statement(thd)) { + mysql_mutex_unlock(&rli->data_lock); + delete ev; WSREP_INFO("Wsrep before statement error"); DBUG_RETURN(1); } |