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

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)