Merge bk-internal:/home/bk/mysql-5.0
into siva.hindu.god:/opt/home/tim/m/50/a
This commit is contained in:
commit
6077a08aab
@ -114,7 +114,7 @@ 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
|
DATADIR=$MY_BASEDIR_VERSION/data
|
||||||
if test -z "$defaults"
|
if test -z "$defaults" -a -r "$DATADIR/my.cnf"
|
||||||
then
|
then
|
||||||
defaults="--defaults-extra-file=$DATADIR/my.cnf"
|
defaults="--defaults-extra-file=$DATADIR/my.cnf"
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user