Commit bb46b79c authored by Oleksandr Byelkin's avatar Oleksandr Byelkin

Fix mutex order according to a new sequence.

parent eab7f5d8
...@@ -9269,8 +9269,8 @@ static my_bool kill_threads_callback(THD *thd, kill_threads_callback_arg *arg) ...@@ -9269,8 +9269,8 @@ static my_bool kill_threads_callback(THD *thd, kill_threads_callback_arg *arg)
return 1; return 1;
if (!arg->threads_to_kill.push_back(thd, arg->thd->mem_root)) 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_kill); // Lock from delete
mysql_mutex_lock(&thd->LOCK_thd_data);
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment