database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix handling of datadir by mysqld_safe to support specifying a

Browse Source 
different DATADIR via the command line or during ./configure and
still starting up mysqld_safe via a relative path. (Bug #7249)


scripts/mysqld_safe.sh:
  Decouple figuring out which BASEDIR and DATADIR to use so that
  the only DATADIR we'll try to use without first verifying that
  it exists is the compiled-in default.
This commit is contained in:
unknown
2005-06-24 17:14:16 -07:00
parent a7e66efc2c
commit 3e7a57632a
1 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
scripts/mysqld_safe.sh
View File

@ -84,31 +84,49 @@ parse_arguments() {
} }
#
# First, try to find BASEDIR and ledir (where mysqld is)
#
MY_PWD=`pwd` MY_PWD=`pwd`
# Check if we are starting this relative (for the binary release) # Check for the directories we would expect from a binary release install
if test -f ./share/mysql/english/errmsg.sys -a \ if test -f ./share/mysql/english/errmsg.sys -a -x ./bin/mysqld
-x ./bin/mysqld
then then
MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are
ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is
DATADIR=$MY_BASEDIR_VERSION/data # Check for the directories we would expect from a source install
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 \ elif test -f ./share/mysql/english/errmsg.sys -a \
-x ./libexec/mysqld -x ./libexec/mysqld
then then
MY_BASEDIR_VERSION=$MY_PWD # Where libexec, share and var are MY_BASEDIR_VERSION=$MY_PWD # Where libexec, share and var are
ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld is ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld is
DATADIR=$MY_BASEDIR_VERSION/var # Since we didn't find anything, used the compiled-in defaults
else else
MY_BASEDIR_VERSION=@prefix@ MY_BASEDIR_VERSION=@prefix@
DATADIR=@localstatedir@
ledir=@libexecdir@ ledir=@libexecdir@
fi fi
#
# Second, try to find the data directory
#
# Try where the binary installs put it
if test -d $MY_BASEDIR_VERSION/data/mysql
then
DATADIR=$MY_BASEDIR_VERSION/data
if test -z "$defaults"
then
defaults="--defaults-extra-file=$DATADIR/my.cnf"
fi
# Next try where the source installs put it
elif test -d $MY_BASEDIR_VERSION/var/mysql
then
DATADIR=$MY_BASEDIR_VERSION/var
# Or just give up and use our compiled-in default
else
DATADIR=@localstatedir@
fi
user=@MYSQLD_USER@ user=@MYSQLD_USER@
niceness=0 niceness=0