Skip to content

Commit

Permalink
Revert "MDEV-21039: Server fails to start with unknown mysqld_safe op…
Browse files Browse the repository at this point in the history
…tions"

This reverts commit 5796021.
  • Loading branch information
Jan Lindström committed Aug 21, 2020
1 parent ece0b06 commit 29d9df1
Showing 1 changed file with 4 additions and 16 deletions.
20 changes: 4 additions & 16 deletions scripts/mysqld_safe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ unsafe_my_cnf=0
wsrep_on=0
dry_run=0
defaults_group_suffix=
ignore_unknown=1

# Initial logging status: error log is not open, and not using syslog
logging=init
Expand Down Expand Up @@ -384,22 +383,11 @@ parse_arguments() {

--help) usage ;;

--ignore-unknown) ignore_unknown=1 ;;
--no-ignore-unknown|--not-ignore-unknown) ignore_unknown=0 ;;

*)
if test $ignore_unknown -eq 0
then
case "$unrecognized_handling" in
collect) append_arg_to_args "$arg" ;;
complain) log_error "unknown option '$arg'"
esac
else
case "$arg" in
"--loose-"*) append_arg_to_args "$arg" ;;
*) append_arg_to_args "--loose-$arg"
esac
fi
case "$unrecognized_handling" in
collect) append_arg_to_args "$arg" ;;
complain) log_error "unknown option '$arg'" ;;
esac
esac
done
}
Expand Down

0 comments on commit 29d9df1

Please sign in to comment.