Skip to content

Commit

Permalink
MDEV-19211 Fix mysqld_safe --dry-run
Browse files Browse the repository at this point in the history
mysqld_safe --dry-run needs to either call exit or return, depending if
it is being sourced or not, otherise return can lead to the error:

return: can only `return' from a function or sourced script

The original fix suggestion was proposed by FaramosCZ <mschorm@centrum.cz>
  • Loading branch information
cvicentiu committed Sep 20, 2019
1 parent 13c2fd3 commit 6a7d51b
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion scripts/mysqld_safe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,13 @@ do
cmd="$cmd "`shell_quote_string "$i"`
done
cmd="$cmd $args"
[ $dry_run -eq 1 ] && return

if [ $dry_run -eq 1 ]
then
# RETURN or EXIT depending if the script is being sourced or not.
(return 2> /dev/null) && return || exit
fi


# Avoid 'nohup: ignoring input' warning
test -n "$NOHUP_NICENESS" && cmd="$cmd < /dev/null"
Expand Down

0 comments on commit 6a7d51b

Please sign in to comment.