diff options
| author | ramil@mysql.com <> | 2006-05-25 16:05:55 +0500 |
|---|---|---|
| committer | ramil@mysql.com <> | 2006-05-25 16:05:55 +0500 |
| commit | bbb991e597e39876e0292772188aeed39a43744e (patch) | |
| tree | bd3c98f9374c108cfc8ab1b0a93ee3b46df58014 /sql/sql_class.cc | |
| parent | ac158d52b9760032da38172e0a9cea178580be00 (diff) | |
| parent | 06938563651914b8bc55d4838685ffea29d79c1e (diff) | |
| download | mariadb-git-bbb991e597e39876e0292772188aeed39a43744e.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b16900
Diffstat (limited to 'sql/sql_class.cc')
| -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) { |