Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 34600 | Differences between
and this patch

Collapse All | Expand All

(-)scripts.orig/mysqld_safe.sh (-24 / +3 lines)
Lines 84-113 Link Here
84
}
84
}
85
85
86
86
87
MY_PWD=`pwd`
87
MY_BASEDIR_VERSION=@prefix@
88
# Check if we are starting this relative (for the binary release)
88
DATADIR=@localstatedir@
89
if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
89
ledir=@libexecdir@
90
 -x ./bin/mysqld
91
then
92
  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
93
  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
94
  DATADIR=$MY_BASEDIR_VERSION/data
95
  if test -z "$defaults"
96
  then
97
    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
98
  fi
99
# Check if this is a 'moved install directory'
100
elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
101
 -x ./libexec/mysqld
102
then
103
  MY_BASEDIR_VERSION=$MY_PWD		# Where libexec, share and var are
104
  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
105
  DATADIR=$MY_BASEDIR_VERSION/var
106
else
107
  MY_BASEDIR_VERSION=@prefix@
108
  DATADIR=@localstatedir@
109
  ledir=@libexecdir@
110
fi
111
90
112
user=@MYSQLD_USER@
91
user=@MYSQLD_USER@
113
niceness=0
92
niceness=0

Return to bug 34600