From d0a1de80b41efa3cc5b58420905c721356eb6a52 Mon Sep 17 00:00:00 2001
From: Jim Winstead <jimw@mysql.com>
Date: Thu, 7 May 2009 17:53:03 -0700
Subject: The arguments to use for ps on Mac OS X were mis-detected by the
 mysql_zap utility. (Bug #41883, patch by Nicklas Westerlund)

---
 scripts/mysql_zap.sh | 4 ++--
 1 file 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: $!";
-- 
cgit v1.2.1