Commit 1d3f4a1a authored by unknown's avatar unknown

Portability fixes to mysqld_safe for non-Linux systems. Fix FIND_PROC

for Solaris test, and fix if @IS_LINUX@ test in mysqld_safe itself.


configure.in:
  Portability fix for FIND_PROC setting; on Solaris (and
  probably others), 'ps -p $$' inside a shell script just
  returns 'sh' for command line, even though $0 contains
  the filename.  So, use 'ps -fp $$' in the test (it shows
  the full command line, e.g., 'sh configure').  Leave the
  actual FIND_PROC command as-is, since mysqld itself is
  not a shell script.
scripts/mysqld_safe.sh:
  Portability fix for mysqld_safe on non-Linux systems.  A bogus use
  of 'if' and 'test' caused non-bash shells to enter a section meant
  to be run only on Linux systems.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parent 9c06c80d
No related merge requests found
...@@ -139,6 +139,7 @@ tim@bitch.mysql.fi ...@@ -139,6 +139,7 @@ tim@bitch.mysql.fi
tim@black.box tim@black.box
tim@hundin.mysql.fi tim@hundin.mysql.fi
tim@sand.box tim@sand.box
tim@siva.hindu.god
tim@threads.polyesthetic.msg tim@threads.polyesthetic.msg
tim@white.box tim@white.box
tim@work.mysql.com tim@work.mysql.com
......
...@@ -444,7 +444,7 @@ if $PS p $$ 2> /dev/null | grep $0 > /dev/null ...@@ -444,7 +444,7 @@ if $PS p $$ 2> /dev/null | grep $0 > /dev/null
then then
FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null"
# Solaris # Solaris
elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null elif $PS -fp $$ 2> /dev/null | grep $0 > /dev/null
then then
FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null"
# BSD style # BSD style
......
...@@ -315,7 +315,7 @@ do ...@@ -315,7 +315,7 @@ do
break break
fi fi
if test @IS_LINUX@ -a $KILL_MYSQLD -eq 1 if @IS_LINUX@ && test $KILL_MYSQLD -eq 1
then then
# Test if one process was hanging. # Test if one process was hanging.
# This is only a fix for Linux (running as base 3 mysqld processes) # This is only a fix for Linux (running as base 3 mysqld processes)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment