summaryrefslogtreecommitdiffstats
path: root/sql/mdl.cc
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 13:22:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 13:22:53 +0000
commit347c164c35eddab388009470e6848cb361ac93f8 (patch)
tree2c0c44eac690f510bb0a35b2a13b36d606b77b6b /sql/mdl.cc
parentReleasing progress-linux version 1:10.11.7-4~progress7.99u1. (diff)
downloadmariadb-347c164c35eddab388009470e6848cb361ac93f8.tar.xz
mariadb-347c164c35eddab388009470e6848cb361ac93f8.zip
Merging upstream version 1:10.11.8.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sql/mdl.cc')
-rw-r--r--sql/mdl.cc11
1 files changed, 2 insertions, 9 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc
index 32374415..13a97b8e 100644
--- a/sql/mdl.cc
+++ b/sql/mdl.cc
@@ -1195,15 +1195,8 @@ MDL_wait::timed_wait(MDL_context_owner *owner, struct timespec *abs_timeout,
{
#ifdef WITH_WSREP
# ifdef ENABLED_DEBUG_SYNC
- // Allow tests to block the applier thread using the DBUG facilities
- DBUG_EXECUTE_IF("sync.wsrep_before_mdl_wait",
- {
- const char act[]=
- "now "
- "wait_for signal.wsrep_before_mdl_wait";
- DBUG_ASSERT(!debug_sync_set_action((owner->get_thd()),
- STRING_WITH_LEN(act)));
- };);
+ // Allow tests to block thread before MDL-wait
+ DEBUG_SYNC(owner->get_thd(), "wsrep_before_mdl_wait");
# endif
if (WSREP_ON && wsrep_thd_is_BF(owner->get_thd(), false))
{