mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
Merge 10.2 into 10.3
This commit is contained in:
commit
9be0b61407
1 changed files with 4 additions and 16 deletions
|
@ -23,7 +23,6 @@ numa_interleave=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
|
||||
|
@ -362,22 +361,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
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue