diff options
| author | unknown <monty@mysql.com> | 2004-12-06 17:16:35 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-12-06 17:16:35 +0200 |
| commit | 19a95482195a158425c66ac629d07da53e4fc1b6 (patch) | |
| tree | 5cfc0009e76810724a4db2904e75e2db2506bd46 /scripts/mysqld_safe.sh | |
| parent | a4a69f73126d247a519a50f5ba21357ce13839fe (diff) | |
| parent | a1fba2daccee3c7c5d46cded39fda7ee7f0d6eae (diff) | |
| download | mariadb-git-19a95482195a158425c66ac629d07da53e4fc1b6.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
sql/sql_show.cc:
Auto merged
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 da7e06f6c05..1f4d17f8885 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -141,12 +141,12 @@ fi args= SET_USER=2 -parse_arguments `$print_defaults --loose-verbose $defaults mysqld server` +parse_arguments `$print_defaults $defaults --loose-verbose 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 `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysqld` parse_arguments PICK-ARGS-FROM-ARGV "$@" safe_mysql_unix_port=${mysql_unix_port:-${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}} |