fix mysqld_safe to work

local function variable was overwriting the global one. also remove unused variable expansion.
MariaDB · Dec 1, 2014 · bf3b4a2 · bf3b4a2
1 parent dbbe831
commit bf3b4a2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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