mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
fix mysqld_safe to work
local function variable was overwriting the global one. also remove unused variable expansion.
This commit is contained in:
@@ -153,7 +153,7 @@ log_notice () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
eval_log_error () {
|
eval_log_error () {
|
||||||
cmd="$1"
|
local cmd="$1"
|
||||||
case $logging in
|
case $logging in
|
||||||
file) cmd="$cmd >> "`shell_quote_string "$err_log"`" 2>&1" ;;
|
file) cmd="$cmd >> "`shell_quote_string "$err_log"`" 2>&1" ;;
|
||||||
syslog)
|
syslog)
|
||||||
@@ -966,9 +966,9 @@ do
|
|||||||
|
|
||||||
if [ -z "$url" ]
|
if [ -z "$url" ]
|
||||||
then
|
then
|
||||||
eval_log_error "$cmd $wsrep_start_position_opt $nohup_redir"
|
eval_log_error "$cmd $wsrep_start_position_opt"
|
||||||
else
|
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
|
fi
|
||||||
|
|
||||||
if [ $want_syslog -eq 0 -a ! -f "$err_log" ]; then
|
if [ $want_syslog -eq 0 -a ! -f "$err_log" ]; then
|
||||||
|
Reference in New Issue
Block a user