Commit 6ed9208e authored by unknown's avatar unknown
Browse files

Merge siva.hindu.god:/opt/home/tim/m/40/bk 

into siva.hindu.god:/opt/home/tim/m/40/a


configure.in:
  Auto merged
parents b80ed3bb 1d3f4a1a

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -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

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -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

scripts/mysqld_safe.sh

+1 −1
Original line number Diff line number Diff line
@@ -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)