Commit b0510c7f authored by tim@siva.hindu.god's avatar tim@siva.hindu.god

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.
parent 22269d45
...@@ -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