Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/usr/home/ram/work/mysql-4.1

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-4.1
6209a394 · unknown · a63df041 · d241298f · 6209a394
Commit 6209a394 authored Mar 03, 2006 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

sql/sql_class.cc sql/sql_class.cc +3 -2

No files found.
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -426,10 +426,11 @@ 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
+  else
    close_active_vio();
 #endif    
  if (mysys_var)