diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-10-22 09:50:11 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-10-29 09:52:40 +0300 |
| commit | aa7ca987db05bae47645578e1233d43874b6a14d (patch) | |
| tree | b9d5ca1f9e0d56882a64faece202f6c825de45e0 /sql/sql_parse.cc | |
| parent | e10838268e4669840499a508f8997dfe86fa3771 (diff) | |
| download | mariadb-git-aa7ca987db05bae47645578e1233d43874b6a14d.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/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 8999397fee7..ba3abd73932 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -9144,6 +9144,7 @@ THD *find_thread_by_id(longlong id, bool query_id) return arg.thd; } + /** kill one thread. @@ -9267,8 +9268,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_kill); // Lock from delete mysql_mutex_lock(&thd->LOCK_thd_data); + mysql_mutex_lock(&thd->LOCK_thd_kill); // Lock from delete } } } |