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

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä 2020-08-21 10:16:49 +03:00
commit a43faf6b16
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/mysqld_safe.sh
View File

@ -23,7 +23,6 @@ numa_interleave=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
@ -390,22 +389,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
then
case "$unrecognized_handling" in case "$unrecognized_handling" in
collect) append_arg_to_args "$arg" ;; collect) append_arg_to_args "$arg" ;;
complain) log_error "unknown option '$arg'" complain) log_error "unknown option '$arg'" ;;
esac esac
else
case "$arg" in
"--loose-"*) append_arg_to_args "$arg" ;;
*) append_arg_to_args "--loose-$arg"
esac
fi
esac esac
done done
} }