diff options
| author | jonas@perch.ndb.mysql.com <> | 2005-12-15 15:11:42 +0100 |
|---|---|---|
| committer | jonas@perch.ndb.mysql.com <> | 2005-12-15 15:11:42 +0100 |
| commit | 2180197c9b0dbe815d89199a120156281d5a4605 (patch) | |
| tree | e56da58276ba773d1237414599dfe3b611e836a3 /sql/sql_class.cc | |
| parent | 6dc0fbbe39f4413ce4f77eac3b8d54bc6a61504c (diff) | |
| parent | 04cff0d055fd63d7f0a9395478171e735799f30b (diff) | |
| download | mariadb-git-2180197c9b0dbe815d89199a120156281d5a4605.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-release
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 3c91e81c57a..a28324c5e28 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -473,10 +473,12 @@ void THD::awake(THD::killed_state state_to_set) killed= state_to_set; if (state_to_set != THD::KILL_QUERY) + { thr_alarm_kill(real_id); #ifdef SIGNAL_WITH_VIO_CLOSE - close_active_vio(); + close_active_vio(); #endif + } if (mysys_var) { pthread_mutex_lock(&mysys_var->mutex); |