diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 09:12:16 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 09:12:16 +0300 |
| commit | de0e7cd72a6e071aba686178a8ff461dd5a757f5 (patch) | |
| tree | 9beb054fb01d917e1359b60debce629056c6ef4b /scripts | |
| parent | 90c8d773ed0ea7de5e735e836e1e33a190711f17 (diff) | |
| parent | a79c25789474f32097e083d3b4953927c04909bc (diff) | |
| download | mariadb-git-de0e7cd72a6e071aba686178a8ff461dd5a757f5.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_safe.sh | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index f40a68a3b1e..22d5a5531c6 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -23,6 +23,7 @@ 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 @@ -361,11 +362,22 @@ parse_arguments() { --help) usage ;; + --ignore-unknown) ignore_unknown=1 ;; + --no-ignore-unknown|--not-ignore-unknown) ignore_unknown=0 ;; + *) - case "$unrecognized_handling" in - collect) append_arg_to_args "$arg" ;; - complain) log_error "unknown option '$arg'" ;; - esac + 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 esac done } |