diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-09-10 09:37:55 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-09-10 09:37:55 +0300 |
| commit | 0db9c26b05439f9d6fc29234966f50d8e393dfe2 (patch) | |
| tree | a4cd07574058b941790e187df5c63d9fafe4a2eb /sql/sql_base.cc | |
| parent | b80641b36cb43206a118ee84fccd90d08fbb8df4 (diff) | |
| parent | 8fb10c24d74cbddbfd6da0b5f4ea9409f8f88e57 (diff) | |
| download | mariadb-git-0db9c26b05439f9d6fc29234966f50d8e393dfe2.tar.gz | |
Automatic merge
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 4826603c720..01649c88b6b 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -8743,7 +8743,7 @@ bool remove_table_from_cache(THD *thd, const char *db, const char *table_name, { if (!in_use->killed) { - in_use->killed= THD::KILL_CONNECTION; + in_use->killed= THD::KILL_SYSTEM_THREAD; pthread_mutex_lock(&in_use->mysys_var->mutex); if (in_use->mysys_var->current_cond) { @@ -9077,7 +9077,7 @@ void mysql_wait_completed_table(ALTER_PARTITION_PARAM_TYPE *lpt, TABLE *my_table if ((in_use->system_thread & SYSTEM_THREAD_DELAYED_INSERT) && ! in_use->killed) { - in_use->killed= THD::KILL_CONNECTION; + in_use->killed= THD::KILL_SYSTEM_THREAD; pthread_mutex_lock(&in_use->mysys_var->mutex); if (in_use->mysys_var->current_cond) { |