diff options
author | pem@mysql.telia.com <> | 2003-07-08 17:50:23 +0200 |
---|---|---|
committer | pem@mysql.telia.com <> | 2003-07-08 17:50:23 +0200 |
commit | 9c3a7a6ba3eb62b5134577e1a42a59c0f5d9ab05 (patch) | |
tree | 74630fcd49c30dc287ee12828be728366d6d070e /sql/sql_base.cc | |
parent | 3e99e79d878e9d747e91fa06ec20e971e34297d2 (diff) | |
parent | c908b555ff3dae8511a7529f2cd8717d1f848c03 (diff) | |
download | mariadb-git-9c3a7a6ba3eb62b5134577e1a42a59c0f5d9ab05.tar.gz |
Merge 4.1 into 5.0 (first pass).
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 641ab46e5e0..28c5ab54edc 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2416,7 +2416,7 @@ bool remove_table_from_cache(THD *thd, const char *db, const char *table_name, /* Kill delayed insert threads */ if (in_use->system_thread && ! in_use->killed) { - in_use->killed=1; + in_use->killed= THD::KILL_CONNECTION; pthread_mutex_lock(&in_use->mysys_var->mutex); if (in_use->mysys_var->current_cond) { |