mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
warn about multiple mysqld --user parameters only if their arguments differ
scripts/mysqld_safe.sh: don't protect mysqld from multiple --user commands - mysqld can take care of itself sql/mysqld.cc: warn about multiple --user parameters only if their arguments differ
This commit is contained in:
@ -43,13 +43,7 @@ parse_arguments() {
|
||||
--basedir=*) MY_BASEDIR_VERSION=`echo "$arg" | sed -e "s;--basedir=;;"` ;;
|
||||
--datadir=*) DATADIR=`echo "$arg" | sed -e "s;--datadir=;;"` ;;
|
||||
--pid-file=*) pid_file=`echo "$arg" | sed -e "s;--pid-file=;;"` ;;
|
||||
--user=*)
|
||||
if test $SET_USER -eq 0
|
||||
then
|
||||
user=`echo "$arg" | sed -e "s;--[^=]*=;;"`
|
||||
fi
|
||||
SET_USER=1
|
||||
;;
|
||||
--user=*) user=`echo "$arg" | sed -e "s;--[^=]*=;;"` ; SET_USER=1 ;;
|
||||
|
||||
# these two might have been set in a [mysqld_safe] section of my.cnf
|
||||
# they are added to mysqld command line to override settings from my.cnf
|
||||
|
Reference in New Issue
Block a user