diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-26 13:34:38 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-26 13:34:38 +0300 |
| commit | 6286a05d80f9911b7cd6ba57b04a6f67d39e499d (patch) | |
| tree | 97a8a27c2d99a4474181e32602414d94944bfd80 /sql/service_wsrep.cc | |
| parent | 0792aff161132fb953510555fe45544991dec95d (diff) | |
| parent | 3c92050d1c907cc548e848d0ab2891a06681ad92 (diff) | |
| download | mariadb-git-6286a05d80f9911b7cd6ba57b04a6f67d39e499d.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/service_wsrep.cc')
| -rw-r--r-- | sql/service_wsrep.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/service_wsrep.cc b/sql/service_wsrep.cc index b32309642af..1731eeec667 100644 --- a/sql/service_wsrep.cc +++ b/sql/service_wsrep.cc @@ -226,7 +226,7 @@ extern "C" my_bool wsrep_thd_bf_abort(THD *bf_thd, THD *victim_thd, { mysql_mutex_assert_owner(&victim_thd->LOCK_thd_kill); mysql_mutex_assert_owner(&victim_thd->LOCK_thd_data); - +#ifdef ENABLED_DEBUG_SYNC DBUG_EXECUTE_IF("sync.before_wsrep_thd_abort", { const char act[]= @@ -236,7 +236,7 @@ extern "C" my_bool wsrep_thd_bf_abort(THD *bf_thd, THD *victim_thd, DBUG_ASSERT(!debug_sync_set_action(bf_thd, STRING_WITH_LEN(act))); };); - +#endif my_bool ret= wsrep_bf_abort(bf_thd, victim_thd); /* Send awake signal if victim was BF aborted or does not |