diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-21 10:16:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-21 10:16:49 +0300 |
| commit | a43faf6b165b78cda9be8d1d11afb7aa2681c4ed (patch) | |
| tree | d057a8bac4604cd69f6c5108b47e98e3c807d1c1 | |
| parent | a79c25789474f32097e083d3b4953927c04909bc (diff) | |
| parent | 29d9df16ffd725cb236238d33bd75f0722256573 (diff) | |
| download | mariadb-git-a43faf6b165b78cda9be8d1d11afb7aa2681c4ed.tar.gz | |
Merge 10.1 into 10.2
| -rw-r--r-- | scripts/mysqld_safe.sh | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index ca49e1256f9..07fa304a4cf 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -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 @@ -390,22 +389,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 } |