Commit 9003c146 authored by unknown's avatar unknown
Browse files

- manual merge

parents 271b2dd8 62150681

configure.in

+3 −11
Original line number Diff line number Diff line
@@ -1047,19 +1047,11 @@ case $SYSTEM_TYPE in 
      MAX_C_OPTIMIZE="-O"

    fi

    ;;

  *darwin7*)

  *darwin[[7-8]]*)

    # don't forget to escape [] like above

    if test "$ac_cv_prog_gcc" = "yes"

    then

      FLAGS="-DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ"

      CFLAGS="$CFLAGS $FLAGS"

      CXXFLAGS="$CXXFLAGS $FLAGS"

      MAX_C_OPTIMIZE="-O"

    fi

    ;;

  *darwin8*)

    if test "$ac_cv_prog_gcc" = "yes"

    then

      FLAGS="-DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ"

      FLAGS="-DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT"

      CFLAGS="$CFLAGS $FLAGS"

      CXXFLAGS="$CXXFLAGS $FLAGS"

      MAX_C_OPTIMIZE="-O"

sql/mysqld.cc

+6 −2
Original line number Diff line number Diff line
@@ -1836,9 +1836,11 @@ static void init_signals(void) 
  sigaddset(&set,SIGPIPE);

#endif

  sigaddset(&set,SIGINT);

#ifndef IGNORE_SIGHUP_SIGQUIT

  sigaddset(&set,SIGQUIT);

  sigaddset(&set,SIGTERM);

  sigaddset(&set,SIGHUP);

#endif

  sigaddset(&set,SIGTERM);



  /* Fix signals if blocked by parents (can happen on Mac OS X) */

  sigemptyset(&sa.sa_mask);
@@ -1921,11 +1923,13 @@ extern "C" void *signal_hand(void *arg __attribute__((unused))) 
#ifdef USE_ONE_SIGNAL_HAND

  (void) sigaddset(&set,THR_SERVER_ALARM);	// For alarms

#endif

#ifndef IGNORE_SIGHUP_SIGQUIT

  (void) sigaddset(&set,SIGQUIT);

  (void) sigaddset(&set,SIGTERM);

#if THR_CLIENT_ALARM != SIGHUP

  (void) sigaddset(&set,SIGHUP);

#endif

#endif

  (void) sigaddset(&set,SIGTERM);

  (void) sigaddset(&set,SIGTSTP);



  /* Save pid to this process (or thread on Linux) */