Commit c5ac9836 authored by Jan Lindström's avatar Jan Lindström Committed by Julius Goryavsky

MDEV-33039 Galera test failure on mysql-wsrep-features#165

We should not set debug sync point when holding a mutex
to avoid mutex ordering failure.
Signed-off-by: default avatarJulius Goryavsky <julius.goryavsky@mariadb.com>
parent 7bf3c312
...@@ -201,11 +201,11 @@ extern "C" void wsrep_handle_SR_rollback(THD *bf_thd, ...@@ -201,11 +201,11 @@ extern "C" void wsrep_handle_SR_rollback(THD *bf_thd,
/* Note: do not store/reset globals before wsrep_bf_abort() call /* Note: do not store/reset globals before wsrep_bf_abort() call
to avoid losing BF thd context. */ to avoid losing BF thd context. */
mysql_mutex_lock(&victim_thd->LOCK_thd_data);
if (!(bf_thd && bf_thd != victim_thd)) if (!(bf_thd && bf_thd != victim_thd))
{ {
DEBUG_SYNC(victim_thd, "wsrep_before_SR_rollback"); DEBUG_SYNC(victim_thd, "wsrep_before_SR_rollback");
} }
mysql_mutex_lock(&victim_thd->LOCK_thd_data);
if (bf_thd) if (bf_thd)
{ {
wsrep_bf_abort(bf_thd, victim_thd); wsrep_bf_abort(bf_thd, victim_thd);
......
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