diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-01 09:19:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-01 09:19:21 +0300 |
| commit | 1d41e9df4ae2de1a0fa6826f6b61310a9a2942ec (patch) | |
| tree | e272f3e7c5ea3b0627716ba3ee3ef35038734b37 | |
| parent | 1bd4115841ecded24217e5d753ed4d9822b4cffd (diff) | |
| download | mariadb-git-1d41e9df4ae2de1a0fa6826f6b61310a9a2942ec.tar.gz | |
MDEV-25314 Assertion `trx.is_wsrep()' failed in wsrep_is_BF_lock_timeout()
In commit 1bd4115841ecded24217e5d753ed4d9822b4cffd the intention
was to move the trx_t::is_wsrep() check to the caller of the function
wsrep_is_BF_lock_timeout().
| -rw-r--r-- | storage/innobase/lock/lock0lock.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index eb26912fee6..515134edc33 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -1800,7 +1800,7 @@ dberr_t lock_wait(que_thr_t *thr) else if (!err) continue; #ifdef WITH_WSREP - else if (wsrep_is_BF_lock_timeout(*trx)); + else if (trx->is_wsrep() && wsrep_is_BF_lock_timeout(*trx)); #endif else { |