mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Automatic merge
This commit is contained in:
@@ -77,7 +77,12 @@ else
|
||||
datadir="$basedir/data"
|
||||
fi
|
||||
sbindir="$basedir/sbin"
|
||||
libexecdir="$basedir/libexec"
|
||||
if test -f "$basedir/bin/mysqld"
|
||||
then
|
||||
libexecdir="$basedir/bin"
|
||||
else
|
||||
libexecdir="$basedir/libexec"
|
||||
fi
|
||||
fi
|
||||
|
||||
# datadir_set is used to determine if datadir was set (and so should be
|
||||
@@ -126,6 +131,12 @@ parse_server_arguments() {
|
||||
datadir="$basedir/data"
|
||||
fi
|
||||
sbindir="$basedir/sbin"
|
||||
if test -f "$basedir/bin/mysqld"
|
||||
then
|
||||
libexecdir="$basedir/bin"
|
||||
else
|
||||
libexecdir="$basedir/libexec"
|
||||
fi
|
||||
libexecdir="$basedir/libexec"
|
||||
;;
|
||||
--datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'`
|
||||
|
Reference in New Issue
Block a user