diff options
| author | unknown <monty@mysql.com> | 2004-06-10 16:44:55 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-06-10 16:44:55 +0300 |
| commit | eefb240b6da0db2023ad3c86f5be8ed338911a04 (patch) | |
| tree | 01375f38f573ba3c8fce00c621ee8615a099aec3 /scripts | |
| parent | 43f0418d330656667420398a2bd14c3ac42b3617 (diff) | |
| parent | 64bbd52a5df11c4455e4869c2c4afbe59891a981 (diff) | |
| download | mariadb-git-eefb240b6da0db2023ad3c86f5be8ed338911a04.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_safe.sh | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 779438e75c3..7b77bf449cd 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -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 |