Commit cea03285 authored by Jan Lindström's avatar Jan Lindström

MDEV-24967 : Signal 11 on ha_innodb.cc::bg_wsrep_kill_trx line 18611

Null poiter reference in case where bf_thd has no trx .e.g. when
we have MDL-conflict.
parent f83e2ecc
...@@ -18688,10 +18688,12 @@ static void bg_wsrep_kill_trx(void *void_arg) ...@@ -18688,10 +18688,12 @@ static void bg_wsrep_kill_trx(void *void_arg)
/* apparently victim trx was meanwhile rolled back. /* apparently victim trx was meanwhile rolled back.
tell bf thd not to wait, in case it already started to */ tell bf thd not to wait, in case it already started to */
trx_t *trx= thd_to_trx(bf_thd); trx_t *trx= thd_to_trx(bf_thd);
if (lock_t *lock= trx->lock.wait_lock) { /* note that bf_thd might not have trx e.g. in case of
trx_mutex_enter(trx); MDL-conflict. */
lock_cancel_waiting_and_release(lock); if (lock_t *lock= (trx ? trx->lock.wait_lock : NULL)) {
trx_mutex_exit(trx); trx_mutex_enter(trx);
lock_cancel_waiting_and_release(lock);
trx_mutex_exit(trx);
} }
goto ret1; goto ret1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment