1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "MDEV-21039: Server fails to start with unknown mysqld_safe options"

Browse Source 
This reverts commit 5796021174fd7096267003b999e02d6cf98f555b.
This commit is contained in:
Jan Lindström 2020-08-21 08:52:45 +03:00
parent ece0b0623c
commit 29d9df16ff
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/mysqld_safe.sh
View File

@ -24,7 +24,6 @@ unsafe_my_cnf=0
wsrep_on=0 wsrep_on=0
dry_run=0 dry_run=0
defaults_group_suffix= defaults_group_suffix=
ignore_unknown=1
# Initial logging status: error log is not open, and not using syslog # Initial logging status: error log is not open, and not using syslog
logging=init logging=init
@ -384,22 +383,11 @@ parse_arguments() {
--help) usage ;; --help) usage ;;
--ignore-unknown) ignore_unknown=1 ;;
--no-ignore-unknown|--not-ignore-unknown) ignore_unknown=0 ;;
*) *)
if test $ignore_unknown -eq 0 case "$unrecognized_handling" in
then collect) append_arg_to_args "$arg" ;;
case "$unrecognized_handling" in complain) log_error "unknown option '$arg'" ;;
collect) append_arg_to_args "$arg" ;; esac
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 esac
done done
} }