bk commit into 5.0 tree (kent:1.1988)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent 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.1988 05/12/18 15:26:37 kent@stripped +6 -0
  Merge

  sql/ha_ndbcluster.cc
    1.224 05/12/18 15:26:30 kent@stripped +0 -19

  sql/sql_class.cc
    1.224 05/12/18 15:24:12 kent@stripped +0 -0
    Auto merged

  mysql-test/t/ndb_multi.test
    1.7 05/12/18 15:24:12 kent@stripped +0 -1
    Auto merged

  mysql-test/t/ndb_basic.test
    1.34 05/12/18 15:24:12 kent@stripped +0 -11
    Auto merged

  mysql-test/r/ndb_multi.result
    1.5 05/12/18 15:24:12 kent@stripped +0 -1
    Auto merged

  mysql-test/r/ndb_basic.result
    1.33 05/12/18 15:24:11 kent@stripped +0 -16
    Auto merged

# 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:	kent
# Host:	c-664072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.0/RESYNC

--- 1.223/sql/sql_class.cc	2005-12-11 08:30:52 +01:00
+++ 1.224/sql/sql_class.cc	2005-12-18 15:24:12 +01:00
@@ -473,10 +473,12 @@
 
   killed= state_to_set;
   if (state_to_set != THD::KILL_QUERY)
+  {
     thr_alarm_kill(real_id);
 #ifdef SIGNAL_WITH_VIO_CLOSE
-  close_active_vio();
+    close_active_vio();
 #endif    
+  }
   if (mysys_var)
   {
     pthread_mutex_lock(&mysys_var->mutex);