mysql-4.1.9-mysqld-safe-sh.diff

mysql-4.1.9-mysqld-safe-sh.diff (text/plain), 1.31 KB, created by Jasmin Buchert on 2005-01-17 18:09:11 UTC

--- mysql-4.1.9/scripts/mysqld_safe.sh.orig	2005-01-15 03:21:34.000000000 +0100
+++ mysql-4.1.9/scripts/mysqld_safe.sh	2005-01-15 03:22:59.000000000 +0100
@@ -83,42 +83,14 @@
   done
 }
 
-
-MY_PWD=`pwd`
-# Check if we are starting this relative (for the binary release)
-if test -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 ./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
+MY_BASEDIR_VERSION=@prefix@
+DATADIR=@localstatedir@
+ledir=@libexecdir@
 
 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
+MYSQLD=mysqld
 
 # these rely on $DATADIR by default, so we'll set them later on
 pid_file=