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

(-)mysql-4.1.0-alpha/scripts/mysqld_safe.sh.orig (-31 / +4 lines)
Lines 82-123 Link Here
82
  done
82
  done
83
}
83
}
84
84
85
MY_PWD=`pwd`
85
MY_BASEDIR_VERSION=@prefix@
86
# Check if we are starting this relative (for the binary release)
86
DATADIR=@localstatedir@
87
if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
87
ledir=@libexecdir@
88
 -x ./bin/mysqld
89
then
90
  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
91
  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
92
  DATADIR=$MY_BASEDIR_VERSION/data
93
  if test -z "$defaults"
94
  then
95
    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
96
  fi
97
# Check if this is a 'moved install directory'
98
elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
99
 -x ./libexec/mysqld
100
then
101
  MY_BASEDIR_VERSION=$MY_PWD		# Where libexec, share and var are
102
  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
103
  DATADIR=$MY_BASEDIR_VERSION/var
104
else
105
  MY_BASEDIR_VERSION=@prefix@
106
  DATADIR=@localstatedir@
107
  ledir=@libexecdir@
108
fi
109
88
110
MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
89
MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
111
MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
90
MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
112
user=@MYSQLD_USER@
91
user=@MYSQLD_USER@
113
92
114
# Use the mysqld-max binary by default if the user doesn't specify a binary
93
MYSQLD=mysqld
115
if test -x $ledir/mysqld-max
116
then
117
  MYSQLD=mysqld-max
118
else
119
  MYSQLD=mysqld
120
fi
121
94
122
# these rely on $DATADIR by default, so we'll set them later on
95
# these rely on $DATADIR by default, so we'll set them later on
123
pid_file=
96
pid_file=

Return to bug 34600