diff options
| -rw-r--r-- | configure.in | 6 | ||||
| -rwxr-xr-x | scripts/safe_mysqld.sh | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/configure.in b/configure.in index f49d15224e5..7a9fead7bd8 100644 --- a/configure.in +++ b/configure.in @@ -341,13 +341,13 @@ AC_PATH_PROG(KILL, kill, kill) AC_MSG_CHECKING("for kill switches") if $ac_cv_path_KILL -0 $$ then - CHECK_PID="$ac_cv_path_KILL -0 \$\$PID" + CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2>&1" elif kill -s 0 $$ then - CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID" + CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID > /dev/null 2>&1" else AC_MSG_WARN([kill -0 to check for pid seems to fail]) - CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID" + CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2>&1" fi AC_SUBST(CHECK_PID) AC_MSG_RESULT("$CHECK_PID") diff --git a/scripts/safe_mysqld.sh b/scripts/safe_mysqld.sh index 55147a84852..28c7fc69fcc 100755 --- a/scripts/safe_mysqld.sh +++ b/scripts/safe_mysqld.sh @@ -88,11 +88,11 @@ then fi -NOHUP_NICENESS=`nohup nice` -if test $? -ne 0 || test x"$NOHUP_NICENESS" = x0 || test ! nice --1 echo foo > /dev/null 2>&1; then - NOHUP_NICENESS="nohup" -else +NOHUP_NICENESS=`nohup nice 2>&1` +if test $? -eq 0 && test x"$NOHUP_NICENESS" != x0 && nice --1 echo foo > /dev/null 2>&1; then NOHUP_NICENESS="nice --$NOHUP_NICENESS nohup" +else + NOHUP_NICENESS="nohup" fi export MYSQL_UNIX_PORT |