diff options
| author | unknown <serg@serg.mylan> | 2003-12-19 23:09:39 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-12-19 23:09:39 +0100 |
| commit | 580ca2ad32e77c1e3edae40513b5bf0f5ba8ffbf (patch) | |
| tree | fd6cfd96b12a58b483423ef72cb233e0a42009db | |
| parent | c9691ab7ccde371cdeaee127ee0f12a298e4031c (diff) | |
| parent | cb12a8b827672c92a9ed7eb1589996856fcea1b4 (diff) | |
| download | mariadb-git-580ca2ad32e77c1e3edae40513b5bf0f5ba8ffbf.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| -rw-r--r-- | scripts/mysqld_safe.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index ece4ba098f4..5d77863c9b4 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -46,8 +46,9 @@ parse_arguments() { --user=*) if test $SET_USER -eq 0 then - user=`echo "$arg" | sed -e "s;--[^=]*=;;"` ; SET_USER=1 + user=`echo "$arg" | sed -e "s;--[^=]*=;;"` fi + SET_USER=1 ;; # these two might have been set in a [mysqld_safe] section of my.cnf @@ -129,7 +130,6 @@ fi # these rely on $DATADIR by default, so we'll set them later on pid_file= err_log= -SET_USER=0 # Get first arguments from the my.cnf file, groups [mysqld] and [mysqld_safe] # and then merge with the command line arguments @@ -147,7 +147,13 @@ else fi args= -parse_arguments `$print_defaults --loose-verbose $defaults mysqld server mysqld_safe safe_mysqld` +SET_USER=2 +parse_arguments `$print_defaults --loose-verbose $defaults mysqld server` +if test $SET_USER -eq 2 +then + SET_USER=0 +fi +parse_arguments `$print_defaults --loose-verbose $defaults mysqld_safe safe_mysqld` parse_arguments PICK-ARGS-FROM-ARGV "$@" if test ! -x $ledir/$MYSQLD |