diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-03-10 12:24:22 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-03-10 12:24:22 +0200 |
| commit | 73c2d4ad498890c2ba2cfa9a2c20fae4d37b1859 (patch) | |
| tree | 7bdc160d3278a49bb97aa782a278ba71fa019bba /scripts | |
| parent | 281ad254dcc0b719df12d2c0374cc9e32c12c0c2 (diff) | |
| download | mariadb-git-73c2d4ad498890c2ba2cfa9a2c20fae4d37b1859.tar.gz | |
Don't allow multiple --user options to mysqld
(First one is used)
scripts/safe_mysqld.sh:
Don't allow multiple --user options
sql/mysqld.cc:
Don't allow multiple --user options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/safe_mysqld.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/safe_mysqld.sh b/scripts/safe_mysqld.sh index c1b231eb001..a8ca3537cb3 100644 --- a/scripts/safe_mysqld.sh +++ b/scripts/safe_mysqld.sh @@ -33,8 +33,12 @@ parse_arguments() { --basedir=*) MY_BASEDIR_VERSION=`echo "$arg" | sed -e "s;--[^=]*=;;"` ;; --datadir=*) DATADIR=`echo "$arg" | sed -e "s;--[^=]*=;;"` ;; --pid-file=*) pid_file=`echo "$arg" | sed -e "s;--[^=]*=;;"` ;; - --user=*) user=`echo "$arg" | sed -e "s;--[^=]*=;;"` ; SET_USER=1 ;; - + --user=*) + if [ $SET_USER == 0 ] + then + user=`echo "$arg" | sed -e "s;--[^=]*=;;"` ; SET_USER=1 + fi + ;; # these two might have been set in a [safe_mysqld] section of my.cnf # they get passed via environment variables to safe_mysqld --socket=*) MYSQL_UNIX_PORT=`echo "$arg" | sed -e "s;--[^=]*=;;"` ;; |