summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-08-20 11:01:47 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-08-20 11:01:47 +0300
commit2fa9f8c53a80e8b52c14d8c3260b18e7e77cc154 (patch)
treee1e69ba81d7dd1b170b8572edc6e7625b38567b8 /scripts
parentf8bf5b0f8431493975f8f4488d0bef6e0e4e289e (diff)
parentde0e7cd72a6e071aba686178a8ff461dd5a757f5 (diff)
downloadmariadb-git-2fa9f8c53a80e8b52c14d8c3260b18e7e77cc154.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysqld_safe.sh20
1 files changed, 16 insertions, 4 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 3dda22507af..dc04c18a6c1 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
@@ -370,11 +371,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
}