bk commit into 5.1 tree (elliot:1.2172)

[Elliot Murphy]

Below is the list of changes that have just been committed into a local
5.1 repository of emurphy. When emurphy 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.2172 06/05/30 07:57:12 elliot@stripped +1 -0
  Merge emurphy@stripped:/home/bk/mysql-5.1-new
  into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new

  sql/mysqld.cc
    1.551 06/05/30 07:57:08 elliot@stripped +0 -0
    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:	elliot
# Host:	scared.(none)
# Root:	/home/emurphy/src/bk-clean/mysql-5.1-new/RESYNC

--- 1.550/sql/mysqld.cc	2006-05-26 17:18:16 -04:00
+++ 1.551/sql/mysqld.cc	2006-05-30 07:57:08 -04:00
@@ -1024,7 +1024,20 @@
   DBUG_VOID_RETURN;
 }
 
-	/* Force server down. kill all connections and threads and exit */
+/*
+  Force server down. Kill all connections and threads and exit
+
+  SYNOPSIS
+  kill_server
+
+  sig_ptr       Signal number that caused kill_server to be called.
+
+  NOTE!
+    A signal number of 0 mean that the function was not called
+    from a signal handler and there is thus no signal to block
+    or stop, we just want to kill the server.
+
+*/
 
 #if defined(__NETWARE__)
 extern "C" void kill_server(int sig_ptr)