summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2002-08-24 05:44:16 +0300
committerunknown <monty@mashka.mysql.fi>2002-08-24 05:44:16 +0300
commit02f8c163e65139ef3d2d7a9967611b30ac6c0f72 (patch)
tree1c291b78b8e23fd7562cf7e469a4f2bb2e8f4565 /scripts
parent839ebeca5ac7c46d53f39d41f57f264767a32c96 (diff)
downloadmariadb-git-02f8c163e65139ef3d2d7a9967611b30ac6c0f72.tar.gz
Give better error from reconnect()
Fixed hang in start_slave_threads() when thread dies quickly. Docs/manual.texi: Changelog client/mysqltest.c: Indentation cleanup More DBUG info libmysql/libmysql.c: More DBUG info Give better error from reconnect() mysql-test/r/rpl_rotate_logs.result: Update results mysql-test/t/rpl_log_pos.test: Fix for fast machines mysql-test/t/rpl_rotate_logs.test: Updated test to be more portable scripts/mysql_zap.sh: Update for MacOSX sql/mini_client.cc: Better error messages from reconnect. Indentation cleanups sql/slave.cc: Fixed hang in start_slave_threads() when thread dies quickly. sql/slave.h: Fixed hang in start_slave_threads() when thread dies quickly.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_zap.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysql_zap.sh b/scripts/mysql_zap.sh
index 312d15e34d6..f485d164282 100644
--- a/scripts/mysql_zap.sh
+++ b/scripts/mysql_zap.sh
@@ -12,7 +12,7 @@ $opt_f= 0;
$opt_t= 0;
$opt_a = "";
-$BSD = -f '/vmunix' || $ENV{"OS"} eq "SunOS4";
+$BSD = -f '/vmunix' || $ENV{"OS"} eq "SunOS4" || $^O eq 'darwin';
$LINUX = $^O eq 'linux';
$pscmd = $BSD ? "/bin/ps -auxww" : $LINUX ? "/bin/ps axuw" : "/bin/ps -ef";