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/sql_parse.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/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index dd0e5cfa34e..d71d29bc85a 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -9102,8 +9102,8 @@ static my_bool find_thread_with_thd_data_lock_callback(THD *thd, find_thread_cal { if (arg->id == (arg->query_id ? thd->query_id : (longlong) thd->thread_id)) { - mysql_mutex_lock(&thd->LOCK_thd_data); mysql_mutex_lock(&thd->LOCK_thd_kill); // Lock from delete + mysql_mutex_lock(&thd->LOCK_thd_data); // XXX DELME arg->thd= thd; return 1; } @@ -9238,8 +9238,8 @@ static my_bool kill_threads_callback(THD *thd, kill_threads_callback_arg *arg) return 1; if (!arg->threads_to_kill.push_back(thd, arg->thd->mem_root)) { - mysql_mutex_lock(&thd->LOCK_thd_data); mysql_mutex_lock(&thd->LOCK_thd_kill); // Lock from delete + mysql_mutex_lock(&thd->LOCK_thd_data); } } } |