database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2019-09-25 10:14:33 +03:00
parent a39c4b5f9f b6bb64e54a
commit d3350c160a
42 changed files with 278 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/mysqld_safe.sh
View File

@ -22,6 +22,7 @@ flush_caches=0
numa_interleave=0
wsrep_on=0
dry_run=0
defaults_group_suffix=
# Initial logging status: error log is not open, and not using syslog
logging=init
@ -358,6 +359,8 @@ parse_arguments() {
append_arg_to_args "$arg"
;;
--defaults-group-suffix=*) defaults_group_suffix="$arg" ;;
--help) usage ;;
*)
@ -932,7 +935,7 @@ then
exit 1
fi
for i in "$ledir/$MYSQLD" "$defaults" "--basedir=$MY_BASEDIR_VERSION" \
for i in "$ledir/$MYSQLD" "$defaults_group_suffix" "$defaults" "--basedir=$MY_BASEDIR_VERSION" \
"--datadir=$DATADIR" "--plugin-dir=$plugin_dir" "$USER_OPTION"
do
cmd="$cmd "`shell_quote_string "$i"`