diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-21 10:17:22 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-21 10:17:22 +0300 |
| commit | 9be0b6140719b7169fa30f54c86519e86b290205 (patch) | |
| tree | 3ffe39b8ce4b4a805241fa8cbf8b8fb0b96bc008 | |
| parent | de0e7cd72a6e071aba686178a8ff461dd5a757f5 (diff) | |
| parent | a43faf6b165b78cda9be8d1d11afb7aa2681c4ed (diff) | |
| download | mariadb-git-9be0b6140719b7169fa30f54c86519e86b290205.tar.gz | |
Merge 10.2 into 10.3
| -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 22d5a5531c6..f40a68a3b1e 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 @@ -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 } |