diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-02-05 15:00:38 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-02-12 18:05:34 +0100 |
| commit | 259a1902a066d01547e5d70ba0e4837d1be62e7b (patch) | |
| tree | 721597f652fc2833c268c1d0cfa53a1b59bb9fe2 /sql/sql_class.h | |
| parent | cbbcc8fa2b8aa4dc4b5a5de74beea6e614fc28f1 (diff) | |
| download | mariadb-git-259a1902a066d01547e5d70ba0e4837d1be62e7b.tar.gz | |
cleanup: THD::abort_current_cond_wait()
* reuse the loop in THD::abort_current_cond_wait, don't duplicate it
* find_thread_by_id should return whatever it has found, it's the
caller's task not to kill COM_DAEMON (if the caller's a killer)
and other minor changes
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 77bde414b31..be61a4047ec 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3322,6 +3322,7 @@ public: if (wsrep_on_local) mysql_mutex_unlock(&LOCK_thd_data); } + void abort_current_cond_wait(bool force); /** Disconnect the associated communication endpoint. */ void disconnect(); @@ -4061,8 +4062,7 @@ public: mysql_mutex_lock(&LOCK_thd_kill); int err= killed_errno(); if (err) - my_message(err, killed_err ? killed_err->msg : ER_THD(this, err), - MYF(0)); + my_message(err, killed_err ? killed_err->msg : ER_THD(this, err), MYF(0)); mysql_mutex_unlock(&LOCK_thd_kill); } /* return TRUE if we will abort query if we make a warning now */ |