diff options
| author | unknown <ramil@mysql.com> | 2006-02-08 14:05:01 +0400 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2006-02-08 14:05:01 +0400 |
| commit | d241298f585bb5a970853113e804282bbd25f77f (patch) | |
| tree | 8020bbd03fa8777c4acada83725c713598676a49 /sql | |
| parent | 2408644096a8d35976710bd66cad764fe3322915 (diff) | |
| parent | 20ae925c7de1ba9fb7474e1217489f4fb5b20507 (diff) | |
| download | mariadb-git-d241298f585bb5a970853113e804282bbd25f77f.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-4.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_class.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 6e24e951aa4..d8edd2d29b2 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -426,11 +426,12 @@ void THD::awake(bool prepare_to_die) THD_CHECK_SENTRY(this); safe_mutex_assert_owner(&LOCK_delete); + thr_alarm_kill(real_id); if (prepare_to_die) killed = 1; - thr_alarm_kill(real_id); #ifdef SIGNAL_WITH_VIO_CLOSE - close_active_vio(); + else + close_active_vio(); #endif if (mysys_var) { |