1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-25314 Assertion `trx.is_wsrep()' failed in wsrep_is_BF_lock_timeout()

Browse Source 
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().
This commit is contained in:
Marko Mäkelä 2021-04-01 09:19:21 +03:00
parent 1bd4115841
commit 1d41e9df4a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/innobase/lock/lock0lock.cc
View File

@ -1800,7 +1800,7 @@ dberr_t lock_wait(que_thr_t *thr)
else if (!err) else if (!err)
continue; continue;
#ifdef WITH_WSREP #ifdef WITH_WSREP
else if (wsrep_is_BF_lock_timeout(*trx)); else if (trx->is_wsrep() && wsrep_is_BF_lock_timeout(*trx));
#endif #endif
else else
{ {