summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2020-08-21 08:52:45 +0300
committerJan Lindström <jan.lindstrom@mariadb.com>2020-08-21 08:52:45 +0300
commit29d9df16ffd725cb236238d33bd75f0722256573 (patch)
tree19d1125244950639aa2435c038a6d6c6f9faa0ca /scripts
parentece0b0623c9c14a2a1de61c53be9e1bcc2b6216c (diff)
downloadmariadb-git-29d9df16ffd725cb236238d33bd75f0722256573.tar.gz
Revert "MDEV-21039: Server fails to start with unknown mysqld_safe options"
This reverts commit 5796021174fd7096267003b999e02d6cf98f555b.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysqld_safe.sh20
1 files changed, 4 insertions, 16 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 3d3d4141dc5..87dc81e8b5f 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -24,7 +24,6 @@ unsafe_my_cnf=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
@@ -384,22 +383,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
}