bzr commit into mysql-5.1-bugteam branch (jimw:2892) Bug#41883

[Jim Winstead]

#At file:///Users/jimw/my/mysql-5.1/ based on revid:jimw@stripped

 2892 Jim Winstead	2009-05-07
      The arguments to use for ps on Mac OS X were mis-detected by the mysql_zap
      utility. (Bug #41883, patch by Nicklas Westerlund)
      modified:
        scripts/mysql_zap.sh

=== modified file 'scripts/mysql_zap.sh'
--- a/scripts/mysql_zap.sh	2006-12-31 00:02:27 +0000
+++ b/scripts/mysql_zap.sh	2009-05-08 00:53:03 +0000
@@ -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: $!";