Skip to content

Commit 2643249

Browse files
committed
Merge 10.3 into 10.4
2 parents 2fa9f8c + 9be0b61 commit 2643249

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

scripts/mysqld_safe.sh

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ numa_interleave=0
2323
wsrep_on=0
2424
dry_run=0
2525
defaults_group_suffix=
26-
ignore_unknown=1
2726

2827
# Initial logging status: error log is not open, and not using syslog
2928
logging=init
@@ -371,22 +370,11 @@ parse_arguments() {
371370

372371
--help) usage ;;
373372

374-
--ignore-unknown) ignore_unknown=1 ;;
375-
--no-ignore-unknown|--not-ignore-unknown) ignore_unknown=0 ;;
376-
377373
*)
378-
if test $ignore_unknown -eq 0
379-
then
380-
case "$unrecognized_handling" in
381-
collect) append_arg_to_args "$arg" ;;
382-
complain) log_error "unknown option '$arg'"
383-
esac
384-
else
385-
case "$arg" in
386-
"--loose-"*) append_arg_to_args "$arg" ;;
387-
*) append_arg_to_args "--loose-$arg"
388-
esac
389-
fi
374+
case "$unrecognized_handling" in
375+
collect) append_arg_to_args "$arg" ;;
376+
complain) log_error "unknown option '$arg'" ;;
377+
esac
390378
esac
391379
done
392380
}

0 commit comments

Comments
 (0)