Commit 5142cd55 authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-11052 mariadb-service-convert does not work after upgrading to 10.1.18

mysqld_safe: don't close stdout and stderr if --dry-run
parent b5aa0f43
...@@ -738,10 +738,6 @@ else ...@@ -738,10 +738,6 @@ else
logging=syslog logging=syslog
fi fi
# close stdout and stderr, everything goes to $logging now
exec 1>&-
exec 2>&-
USER_OPTION="" USER_OPTION=""
if test -w / -o "$USER" = "root" if test -w / -o "$USER" = "root"
then then
...@@ -987,9 +983,14 @@ do ...@@ -987,9 +983,14 @@ do
done done
cmd="$cmd $args" cmd="$cmd $args"
[ $dry_run -eq 1 ] && return [ $dry_run -eq 1 ] && return
# Avoid 'nohup: ignoring input' warning # Avoid 'nohup: ignoring input' warning
test -n "$NOHUP_NICENESS" && cmd="$cmd < /dev/null" test -n "$NOHUP_NICENESS" && cmd="$cmd < /dev/null"
# close stdout and stderr, everything goes to $logging now
exec 1>&-
exec 2>&-
log_notice "Starting $MYSQLD daemon with databases from $DATADIR" log_notice "Starting $MYSQLD daemon with databases from $DATADIR"
# variable to track the current number of "fast" (a.k.a. subsecond) restarts # variable to track the current number of "fast" (a.k.a. subsecond) restarts
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment