diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 060586b687419a58595553f7a055da16f77eb950..a716afb2392583bce75445576405e1c36e4107d3 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -139,6 +139,7 @@ tim@bitch.mysql.fi
 tim@black.box
 tim@hundin.mysql.fi
 tim@sand.box
+tim@siva.hindu.god
 tim@threads.polyesthetic.msg
 tim@white.box
 tim@work.mysql.com
diff --git a/configure.in b/configure.in
index 0c520ca8980e566523d53ac59a3725bc0a29e8dd..06a0c1bd52f9b37a4d6f8c0920e9cb80c7f63d79 100644
--- a/configure.in
+++ b/configure.in
@@ -444,7 +444,7 @@ if $PS p $$ 2> /dev/null | grep $0 > /dev/null
 then
   FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null"
 # Solaris
-elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null
+elif $PS -fp $$ 2> /dev/null | grep $0 > /dev/null
 then
   FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null"
 # BSD style
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index b9e7ce21f79f8009f983c307221147ec268f1af8..da7e06f6c0515377177c06ba12ff6ad63f1c3bc7 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -315,7 +315,7 @@ do
     break
   fi
 
-  if test @IS_LINUX@ -a $KILL_MYSQLD -eq 1
+  if @IS_LINUX@ && test $KILL_MYSQLD -eq 1
   then
     # Test if one process was hanging.
     # This is only a fix for Linux (running as base 3 mysqld processes)