diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-02-07 17:48:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-02-12 18:17:06 +0100 |
| commit | eac8341df4c3c7b98360f4e9498acf393dc055e3 (patch) | |
| tree | 6e68141971047c34568b42451f1510ba906d4497 /sql/slave.cc | |
| parent | 9703cffa8cb57e2fe29719f4aae3282bfae82878 (diff) | |
| download | mariadb-git-eac8341df4c3c7b98360f4e9498acf393dc055e3.tar.gz | |
MDEV-23328 Server hang due to Galera lock conflict resolution
adaptation of 29bbcac0ee8 for 10.4
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 372e46acd1d..31bd9372a14 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1069,8 +1069,8 @@ terminate_slave_thread(THD *thd, int error __attribute__((unused)); DBUG_PRINT("loop", ("killing slave thread")); - mysql_mutex_lock(&thd->LOCK_thd_data); mysql_mutex_lock(&thd->LOCK_thd_kill); + mysql_mutex_lock(&thd->LOCK_thd_data); #ifndef DONT_USE_THR_ALARM /* Error codes from pthread_kill are: |