mirror of
https://github.com/MariaDB/server.git
synced 2025-08-05 13:16:09 +03:00
Fix handling of libexecdir and sbindir in mysql.server, and note that
basedir and datadir settings in script may be overwritten by settings in configuration files. (Bug #12550) support-files/mysql.server.sh: Note that basedir, datadir settings can be overwritten by configuration, and make sbindir and libexecdir distinct from bindir when setting it based on basedir.
This commit is contained in:
@@ -39,7 +39,8 @@
|
|||||||
# 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
|
# If you change base dir, you must also change datadir. These may get
|
||||||
|
# overwritten by settings in the MySQL configuration files.
|
||||||
|
|
||||||
basedir=
|
basedir=
|
||||||
datadir=
|
datadir=
|
||||||
@@ -61,8 +62,8 @@ then
|
|||||||
else
|
else
|
||||||
bindir="$basedir/bin"
|
bindir="$basedir/bin"
|
||||||
datadir="$basedir/data"
|
datadir="$basedir/data"
|
||||||
sbindir="$basedir/bin"
|
sbindir="$basedir/sbin"
|
||||||
libexecdir="$basedir/bin"
|
libexecdir="$basedir/libexec"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -99,8 +100,8 @@ parse_server_arguments() {
|
|||||||
--basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'`
|
--basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'`
|
||||||
bindir="$basedir/bin"
|
bindir="$basedir/bin"
|
||||||
datadir="$basedir/data"
|
datadir="$basedir/data"
|
||||||
sbindir="$basedir/bin"
|
sbindir="$basedir/sbin"
|
||||||
libexecdir="$basedir/bin"
|
libexecdir="$basedir/libexec"
|
||||||
;;
|
;;
|
||||||
--datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
|
--datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
|
||||||
--user=*) user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
|
--user=*) user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
|
||||||
@@ -240,7 +241,7 @@ case "$mode" in
|
|||||||
if test -x $libexecdir/mysqlmanager
|
if test -x $libexecdir/mysqlmanager
|
||||||
then
|
then
|
||||||
manager=$libexecdir/mysqlmanager
|
manager=$libexecdir/mysqlmanager
|
||||||
elif test -x $bindir/mysqlmanager
|
elif test -x $sbindir/mysqlmanager
|
||||||
then
|
then
|
||||||
manager=$sbindir/mysqlmanager
|
manager=$sbindir/mysqlmanager
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user