--- mysql-4.0.18/scripts/mysqld_safe.sh.orig	2004-02-10 10:15:48.000000000 -0800
+++ mysql-4.0.18/scripts/mysqld_safe.sh	2004-03-04 13:45:27.000000000 -0800
@@ -89,42 +89,14 @@
   done
 }
 
-
-MY_PWD=`pwd`
-# Check if we are starting this relative (for the binary release)
-if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
- -x ./bin/mysqld
-then
-  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
-  DATADIR=$MY_BASEDIR_VERSION/data
-  if test -z "$defaults"
-  then
-    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
-  fi
-# Check if this is a 'moved install directory'
-elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
- -x ./libexec/mysqld
-then
-  MY_BASEDIR_VERSION=$MY_PWD		# Where libexec, share and var are
-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
-  DATADIR=$MY_BASEDIR_VERSION/var
-else
   MY_BASEDIR_VERSION=@prefix@
   DATADIR=@localstatedir@
   ledir=@libexecdir@
-fi
 
 user=@MYSQLD_USER@
 niceness=0
 
-# Use the mysqld-max binary by default if the user doesn't specify a binary
-if test -x $ledir/mysqld-max
-then
-  MYSQLD=mysqld-max
-else
   MYSQLD=mysqld
-fi
 
 # these rely on $DATADIR by default, so we'll set them later on
 pid_file=