diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-12-01 16:43:09 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-12-01 16:43:09 +0100 |
| commit | bf3b4a23f75de50e0f1ab4a562e5801dabc7305b (patch) | |
| tree | bcbf23cd4e6774e24f95d7b0186a91e991554efe | |
| parent | dbbe8310964266f78882c926ec363a10066d1824 (diff) | |
| download | mariadb-git-bf3b4a23f75de50e0f1ab4a562e5801dabc7305b.tar.gz | |
fix mysqld_safe to work
local function variable was overwriting the global one.
also remove unused variable expansion.
| -rw-r--r-- | scripts/mysqld_safe.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index f91d936c315..9a1d43ba996 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -153,7 +153,7 @@ log_notice () { } eval_log_error () { - cmd="$1" + local cmd="$1" case $logging in file) cmd="$cmd >> "`shell_quote_string "$err_log"`" 2>&1" ;; syslog) @@ -966,9 +966,9 @@ do if [ -z "$url" ] then - eval_log_error "$cmd $wsrep_start_position_opt $nohup_redir" + eval_log_error "$cmd $wsrep_start_position_opt" else - eval_log_error "$cmd $wsrep_start_position_opt --wsrep_cluster_address=$url $nohup_redir" + eval_log_error "$cmd $wsrep_start_position_opt --wsrep_cluster_address=$url" fi if [ $want_syslog -eq 0 -a ! -f "$err_log" ]; then |