diff options
| author | unknown <ramil@mysql.com> | 2006-05-25 16:05:55 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2006-05-25 16:05:55 +0500 |
| commit | ee527a9a7da62bc10f52e34a9ff2996b3782cfb2 (patch) | |
| tree | bd3c98f9374c108cfc8ab1b0a93ee3b46df58014 /sql | |
| parent | f1c8dab368daa36edc93dd8ec9444215946b6509 (diff) | |
| parent | 6209a3946498fc9b03edb95769d4675a9b407243 (diff) | |
| download | mariadb-git-ee527a9a7da62bc10f52e34a9ff2996b3782cfb2.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b16900
sql/sql_class.cc:
Auto merged
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 d278ebe8dfa..acca4aaa4e0 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) { |