diff options
| author | unknown <serg@serg.mylan> | 2004-06-10 13:58:32 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-06-10 13:58:32 +0200 |
| commit | 64bbd52a5df11c4455e4869c2c4afbe59891a981 (patch) | |
| tree | 8a6257874fdea272828d6dc08f2f3a48830d2dfb | |
| parent | 7a00d199a4bc83f9e3d940003c6c0f6c117d9650 (diff) | |
| parent | 93290dad1ff132ede9e80afe956e7b5b5d6fed25 (diff) | |
| download | mariadb-git-64bbd52a5df11c4455e4869c2c4afbe59891a981.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 | 8 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
2 files changed, 2 insertions, 8 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 diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 3cd42dbeac1..80e9292a873 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4624,7 +4624,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), mysql_data_home= mysql_real_data_home; break; case 'u': - if (!mysqld_user) + if (!mysqld_user || !strcmp(mysqld_user, argument)) mysqld_user= argument; else fprintf(stderr, "Warning: Ignoring user change to '%s' because the user was set to '%s' earlier on the command line\n", argument, mysqld_user); |