bk commit into 5.0 tree (msvensson:1.2146)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.2146 06/05/19 13:09:15 msvensson@neptunus.(none) +2 -0
  Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  sql/mysqld.cc
    1.547 06/05/19 13:09:09 msvensson@neptunus.(none) +0 -0
    Auto merged

  include/my_pthread.h
    1.91 06/05/19 13:09:08 msvensson@neptunus.(none) +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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0/RESYNC

--- 1.90/include/my_pthread.h	2005-12-12 18:52:29 +01:00
+++ 1.91/include/my_pthread.h	2006-05-19 13:09:08 +02:00
@@ -332,12 +332,14 @@
   we want to make sure that no such flags are set.
 */
 #if defined(HAVE_SIGACTION) && !defined(my_sigset)
-#define my_sigset(A,B) do { struct sigaction s; sigset_t set;              \
+#define my_sigset(A,B) do { struct sigaction s; sigset_t set; int rc;      \
+                            DBUG_ASSERT((A) != 0);                         \
                             sigemptyset(&set);                             \
                             s.sa_handler = (B);                            \
                             s.sa_mask    = set;                            \
                             s.sa_flags   = 0;                              \
-                            sigaction((A), &s, (struct sigaction *) NULL); \
+                            rc= sigaction((A), &s, (struct sigaction *) NULL);\
+                            DBUG_ASSERT(rc == 0);                          \
                           } while (0)
 #elif defined(HAVE_SIGSET) && !defined(my_sigset)
 #define my_sigset(A,B) sigset((A),(B))

--- 1.546/sql/mysqld.cc	2006-05-08 17:09:02 +02:00
+++ 1.547/sql/mysqld.cc	2006-05-19 13:09:09 +02:00
@@ -954,7 +954,8 @@
     RETURN_FROM_KILL_SERVER;
   kill_in_progress=TRUE;
   abort_loop=1;					// This should be set
-  my_sigset(sig,SIG_IGN);
+  if (sig != 0) // 0 is not a valid signal number
+    my_sigset(sig,SIG_IGN);
   if (sig == MYSQL_KILL_SIGNAL || sig == 0)
     sql_print_information(ER(ER_NORMAL_SHUTDOWN),my_progname);
   else