bk commit into 4.0 tree (kp:1.2158)

[gkrishna]

Below is the list of changes that have just been committed into a local
4.0 repository of kp. When kp 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.2158 05/11/16 12:05:12 kp@stripped[kp] +1 -0
  force_kill_connection.patch

  sql/sql_parse.cc
    1.394 05/10/19 16:54:16 kp@stripped[kp] +3 -0
    Import patch force_kill_connection.patch

# 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:	kp
# Host:	blr-techserv.blr.novell.com
# Root:	/home/kp/blr-engrlinux/bk/new/Sawtooth_SP2

--- 1.393/sql/sql_parse.cc	2005-05-31 14:38:12 +05:30
+++ 1.394/sql/sql_parse.cc	2005-10-19 16:54:16 +05:30
@@ -3892,6 +3892,9 @@
 	!strcmp(thd->user,tmp->user))
     {
       tmp->awake(1 /*prepare to die*/);
+      #ifdef __NETWARE__  
+      close_connection(&tmp->net);      
+      #endif
       error=0;
     }
     else