diff options
| author | Jim Winstead <jimw@mysql.com> | 2009-05-07 17:53:03 -0700 |
|---|---|---|
| committer | Jim Winstead <jimw@mysql.com> | 2009-05-07 17:53:03 -0700 |
| commit | d0a1de80b41efa3cc5b58420905c721356eb6a52 (patch) | |
| tree | 20f9a821a04382488c19e36a0140c15526e58caa /scripts | |
| parent | 464252a25b87706a1c36306e1e4d13f738a5f71a (diff) | |
| download | mariadb-git-d0a1de80b41efa3cc5b58420905c721356eb6a52.tar.gz | |
The arguments to use for ps on Mac OS X were mis-detected by the mysql_zap
utility. (Bug #41883, patch by Nicklas Westerlund)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_zap.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysql_zap.sh b/scripts/mysql_zap.sh index 6c05afb772c..3bb92aaec2e 100644 --- a/scripts/mysql_zap.sh +++ b/scripts/mysql_zap.sh @@ -27,8 +27,8 @@ $opt_f= 0; $opt_t= 0; $opt_a = ""; -$BSD = -f '/vmunix' || $ENV{"OS"} eq "SunOS4" || $^O eq 'darwin'; -$LINUX = $^O eq 'linux'; +$BSD = -f '/vmunix' || $ENV{"OS"} eq "SunOS4"; +$LINUX = $^O eq 'linux' || $^O eq 'darwin'; $pscmd = $BSD ? "/bin/ps -auxww" : $LINUX ? "/bin/ps axuw" : "/bin/ps -ef"; open(TTYIN, "</dev/tty") || die "can't read /dev/tty: $!"; |