diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-21 10:19:44 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-21 10:19:44 +0300 |
| commit | 2643249da51dadfe2d9b5cd1db194a89eace0e92 (patch) | |
| tree | 63f7969734a3030be9c29048b5b9b68e69bed12d /scripts | |
| parent | 2fa9f8c53a80e8b52c14d8c3260b18e7e77cc154 (diff) | |
| parent | 9be0b6140719b7169fa30f54c86519e86b290205 (diff) | |
| download | mariadb-git-2643249da51dadfe2d9b5cd1db194a89eace0e92.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'scripts')
| -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 dc04c18a6c1..3dda22507af 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 @@ -371,22 +370,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 } |