diff options
| author | monty@narttu.mysql.fi <> | 2003-03-10 12:48:43 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-03-10 12:48:43 +0200 |
| commit | f1635f64f9fea3cd747e9f38653aa4ba5b5f3ed6 (patch) | |
| tree | 8651694def257832c6e225eead2eec4c5a7c9aeb /scripts/mysqld_safe.sh | |
| parent | e98a4473b42c75851b2bed1a82d06596637279c9 (diff) | |
| parent | c231b747e3d5bea9bf636528bf5491dd29ebab8e (diff) | |
| download | mariadb-git-f1635f64f9fea3cd747e9f38653aa4ba5b5f3ed6.tar.gz | |
Merge with 3.23 to get fixes for --user and BACKUP TABLE
Diffstat (limited to 'scripts/mysqld_safe.sh')
| -rw-r--r-- | scripts/mysqld_safe.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 3ccf5301503..bc29ac1c555 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -38,7 +38,12 @@ 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=*) 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 [mysqld_safe] section of my.cnf # they get passed via environment variables to mysqld_safe |