diff options
| author | unknown <serg@serg.mysql.com> | 2003-03-13 13:44:03 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2003-03-13 13:44:03 +0100 |
| commit | 50da5c1858ca2343f950e748991714f2f6813a1e (patch) | |
| tree | 7a057f11634bb468082003e00b9d3a2f310b8d91 /scripts/mysqld_safe.sh | |
| parent | a4aaac02f3b50f2009a163d531afb686a03e47dd (diff) | |
| parent | c7551b88408430007ed7c27ed5e9f40f584e29d0 (diff) | |
| download | mariadb-git-50da5c1858ca2343f950e748991714f2f6813a1e.tar.gz | |
merged
man/perror.1:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.cc:
Auto merged
sql/sql_select.cc:
Auto merged
strings/ctype-tis620.c:
Auto merged
mysql-test/r/analyse.result:
ul
mysql-test/r/group_by.result:
ul
mysql-test/r/select.result:
ul
Diffstat (limited to 'scripts/mysqld_safe.sh')
| -rw-r--r-- | scripts/mysqld_safe.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index bc29ac1c555..094b1fbfcd3 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -39,8 +39,8 @@ parse_arguments() { --datadir=*) DATADIR=`echo "$arg" | sed -e "s;--datadir=;;"` ;; --pid-file=*) pid_file=`echo "$arg" | sed -e "s;--pid-file=;;"` ;; --user=*) - if [ $SET_USER == 0 ] - then + if test $SET_USER -eq 0 + then user=`echo "$arg" | sed -e "s;--[^=]*=;;"` ; SET_USER=1 fi ;; |