diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-02-05 14:59:27 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-02-12 18:14:20 +0100 |
| commit | 9703cffa8cb57e2fe29719f4aae3282bfae82878 (patch) | |
| tree | 9e9d6a7dcf0f7ceff47091b47465a06613fc2dcb /sql/sql_repl.cc | |
| parent | 259a1902a066d01547e5d70ba0e4837d1be62e7b (diff) | |
| download | mariadb-git-9703cffa8cb57e2fe29719f4aae3282bfae82878.tar.gz | |
don't take mutexes conditionally
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 622eff2faae..a0d8b4ca6d1 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -3474,7 +3474,7 @@ static my_bool kill_callback(THD *thd, kill_callback_arg *arg) thd->variables.server_id == arg->slave_server_id) { arg->thd= thd; - if (WSREP(thd)) mysql_mutex_lock(&thd->LOCK_thd_data); + mysql_mutex_lock(&thd->LOCK_thd_data); mysql_mutex_lock(&thd->LOCK_thd_kill); // Lock from delete return 1; } @@ -3496,7 +3496,7 @@ void kill_zombie_dump_threads(uint32 slave_server_id) */ arg.thd->awake_no_mutex(KILL_SLAVE_SAME_ID); mysql_mutex_unlock(&arg.thd->LOCK_thd_kill); - if (WSREP(arg.thd)) mysql_mutex_unlock(&arg.thd->LOCK_thd_data); + mysql_mutex_unlock(&arg.thd->LOCK_thd_data); } } |