diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2003-07-28 23:26:26 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2003-07-28 23:26:26 +0000 |
commit | 480f659d30040ce0dffcfb84d1a9ce2fa12ed5ab (patch) | |
tree | f41dbfffcf5739f821d14147e7dbd5c856855aaa /dev-db/mysql/files/mysql-4.0.14-mysqld-safe-sh.diff | |
parent | complete 4.0.14 (diff) | |
download | gentoo-2-480f659d30040ce0dffcfb84d1a9ce2fa12ed5ab.tar.gz gentoo-2-480f659d30040ce0dffcfb84d1a9ce2fa12ed5ab.tar.bz2 gentoo-2-480f659d30040ce0dffcfb84d1a9ce2fa12ed5ab.zip |
complete 4.0.14
Diffstat (limited to 'dev-db/mysql/files/mysql-4.0.14-mysqld-safe-sh.diff')
-rw-r--r-- | dev-db/mysql/files/mysql-4.0.14-mysqld-safe-sh.diff | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/dev-db/mysql/files/mysql-4.0.14-mysqld-safe-sh.diff b/dev-db/mysql/files/mysql-4.0.14-mysqld-safe-sh.diff new file mode 100644 index 000000000000..ed744134b51e --- /dev/null +++ b/dev-db/mysql/files/mysql-4.0.14-mysqld-safe-sh.diff @@ -0,0 +1,51 @@ +--- mysql-4.0.14/scripts/mysqld_safe.sh.orig 2003-07-18 07:57:41.000000000 -0700 ++++ mysql-4.0.14/scripts/mysqld_safe.sh 2003-07-28 15:01:24.000000000 -0700 +@@ -88,44 +88,16 @@ + 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 ++MY_BASEDIR_VERSION=@prefix@ ++DATADIR=@localstatedir@ ++ledir=@libexecdir@ + + MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@} + MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@} + 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= |