From c5ac9836b3fb5eabd9857056f498cc3870cf6ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@galeracluster.com>
Date: Mon, 29 Jan 2024 15:04:57 +0200
Subject: [PATCH] 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: Julius Goryavsky <julius.goryavsky@mariadb.com>
---
 sql/service_wsrep.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/service_wsrep.cc b/sql/service_wsrep.cc
index 17240fd4fbd..06513387ac7 100644
--- a/sql/service_wsrep.cc
+++ b/sql/service_wsrep.cc
@@ -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
      to avoid losing BF thd context. */
-  mysql_mutex_lock(&victim_thd->LOCK_thd_data);
   if (!(bf_thd && bf_thd != victim_thd))
   {
     DEBUG_SYNC(victim_thd, "wsrep_before_SR_rollback");
   }
+  mysql_mutex_lock(&victim_thd->LOCK_thd_data);
   if (bf_thd)
   {
     wsrep_bf_abort(bf_thd, victim_thd);