diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 06:00:36 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 06:00:36 +0300 |
| commit | bfba2bce6a350e2893c76e42415ac733c39a3976 (patch) | |
| tree | 755c71d2936863d0d59be892902fd481e5207691 /scripts | |
| parent | 309302a3dad5f06cb62b0846dcb8a3671d91ff29 (diff) | |
| parent | ece0b0623c9c14a2a1de61c53be9e1bcc2b6216c (diff) | |
| download | mariadb-git-bfba2bce6a350e2893c76e42415ac733c39a3976.tar.gz | |
Merge 10.1 into 10.2
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 07fa304a4cf..ca49e1256f9 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 @@ -389,11 +390,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 } |