Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
This commit is contained in:
commit
de40cf0178
@ -39,17 +39,20 @@
|
|||||||
# If you want to affect other MySQL variables, you should make your changes
|
# If you want to affect other MySQL variables, you should make your changes
|
||||||
# in the /etc/my.cnf, ~/.my.cnf or other MySQL configuration files.
|
# in the /etc/my.cnf, ~/.my.cnf or other MySQL configuration files.
|
||||||
|
|
||||||
|
# If you change base dir, you must also change datadir
|
||||||
|
|
||||||
basedir=
|
basedir=
|
||||||
|
datadir=
|
||||||
|
|
||||||
# The following variables are only set for letting mysql.server find things.
|
# The following variables are only set for letting mysql.server find things.
|
||||||
|
|
||||||
# Set some defaults
|
# Set some defaults
|
||||||
datadir=@localstatedir@
|
|
||||||
pid_file=
|
pid_file=
|
||||||
if test -z "$basedir"
|
if test -z "$basedir"
|
||||||
then
|
then
|
||||||
basedir=@prefix@
|
basedir=@prefix@
|
||||||
bindir=@bindir@
|
bindir=@bindir@
|
||||||
|
datadir=@localstatedir@
|
||||||
else
|
else
|
||||||
bindir="$basedir/bin"
|
bindir="$basedir/bin"
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user