bk commit into 4.1 tree (ramil:1.2470) BUG#16900

[ramil]

Below is the list of changes that have just been committed into a local
4.1 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2470 06/02/02 10:27:48 ramil@stripped +1 -0
  Fix for bug #16900: Crash during query "reap" on OS X.

  sql/sql_class.cc
    1.205 06/02/02 10:27:34 ramil@stripped +3 -2
    Fix for bug #16900: Crash during query "reap" on OS X.
    -  call close_active_vio() only if we don't kill the thread.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/mysql-4.1

--- 1.204/sql/sql_class.cc	2006-01-18 15:49:33 +04:00
+++ 1.205/sql/sql_class.cc	2006-02-02 10:27:34 +04:00
@@ -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)
   {