Commit 891361be authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-4.1 

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
parents 0138267b 5c484b20

include/my_pthread.h

+4 −2
Original line number Diff line number Diff line
@@ -329,12 +329,14 @@ int sigwait(sigset_t *setp, int *sigp); /* Use our implemention */ 
  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))

sql/mysqld.cc

+2 −1
Original line number Diff line number Diff line
@@ -884,6 +884,7 @@ static void __cdecl kill_server(int sig_ptr) 
    RETURN_FROM_KILL_SERVER;

  kill_in_progress=TRUE;

  abort_loop=1;					// This should be set

  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);