bk commit into 5.1 tree (tsmith:1.2527)

[tim]

Below is the list of changes that have just been committed into a local
5.1 repository of tsmith. When tsmith 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@stripped, 2007-03-28 18:58:20-06:00, tsmith@stripped +2 -0
  Merge siva.hindu.god:/home/tsmith/m/bk/50
  into  siva.hindu.god:/home/tsmith/m/bk/51-mrg28
  MERGE: 1.1616.2881.71

  mysys/thr_alarm.c@stripped, 2007-03-28 18:53:08-06:00, tsmith@stripped +0 -4
    Use local
    MERGE: 1.44.2.8

  sql/mysqld.cc@stripped, 2007-03-28 18:58:13-06:00, tsmith@stripped +0 -9
    manual merge
    MERGE: 1.356.98.42

# 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:	tsmith
# Host:	siva.hindu.god
# Root:	/home/tsmith/m/bk/51-mrg28/RESYNC

--- 1.623/sql/mysqld.cc	2007-03-28 18:48:24 -06:00
+++ 1.624/sql/mysqld.cc	2007-03-28 18:58:13 -06:00
@@ -2349,10 +2349,8 @@ static void init_signals(void)
 #ifdef SIGTSTP
   sigaddset(&set,SIGTSTP);
 #endif
-  sigaddset(&set,THR_SERVER_ALARM);
   if (test_flags & TEST_SIGINT)
     sigdelset(&set,THR_KILL_SIGNAL);		// May be SIGINT
-  sigdelset(&set,THR_CLIENT_ALARM);		// For alarms
   sigprocmask(SIG_SETMASK,&set,NULL);
   pthread_sigmask(SIG_SETMASK,&set,NULL);
   DBUG_VOID_RETURN;