diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-10-28 11:25:15 +0300 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-10-29 20:38:11 +0200 |
| commit | d5bc05798f18af4b6c51075fd6b92c595ebf066f (patch) | |
| tree | 11a26ffe1dc069e0542f5c43faf51602fe362b1b /sql/slave.cc | |
| parent | 1974df01d5fddcfd891809dcea2c6d922b009682 (diff) | |
| download | mariadb-git-d5bc05798f18af4b6c51075fd6b92c595ebf066f.tar.gz | |
MDEV-25114: Crash: WSREP: invalid state ROLLED_BACK (FATAL)
Revert "MDEV-23328 Server hang due to Galera lock conflict resolution"
This reverts commit eac8341df4c3c7b98360f4e9498acf393dc055e3.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 62ceb07b224..c63eee605f5 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1072,8 +1072,8 @@ terminate_slave_thread(THD *thd, int error __attribute__((unused)); DBUG_PRINT("loop", ("killing slave thread")); - mysql_mutex_lock(&thd->LOCK_thd_kill); mysql_mutex_lock(&thd->LOCK_thd_data); + mysql_mutex_lock(&thd->LOCK_thd_kill); #ifndef DONT_USE_THR_ALARM /* Error codes from pthread_kill are: |