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

Bug#25088048 ADDITIONAL ISSUES IN MYSQLD_SAFE

Don't read --ledir option from config file.
Ignore current working for finding location of mysqld
Remove use of chown/chmod in scripts.
Be helpful only when basedir is /var/log or /var/lib.
Removed unused systemd files for SLES.
Set explicit basedir in scripts.
This commit is contained in:
Terje Rosten
2016-11-16 13:41:27 +01:00
parent a63185e863
commit cdd57aa719
9 changed files with 41 additions and 138 deletions

View File

@ -218,7 +218,13 @@ parse_arguments() {
# mysqld_safe-specific options - must be set in my.cnf ([mysqld_safe])!
--core-file-size=*) core_file_size="$val" ;;
--ledir=*) ledir="$val" ;;
--ledir=*)
if [ -z "$pick_args" ]; then
log_error "--ledir option can only be used as command line option, found in config file"
exit 1
fi
ledir="$val"
;;
--malloc-lib=*) set_malloc_lib "$val" ;;
--mysqld=*)
if [ -z "$pick_args" ]; then
@ -394,7 +400,15 @@ else
relpkgdata='@pkgdatadir@'
fi
MY_PWD=`pwd`
case "$0" in
/*)
MY_PWD='@prefix@'
;;
*)
MY_PWD=`dirname $0`
MY_PWD=`dirname $MY_PWD`
;;
esac
# Check for the directories we would expect from a binary release install
if test -n "$MY_BASEDIR_VERSION" -a -d "$MY_BASEDIR_VERSION"
then