database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge remote-tracking branch 'origin/10.1' into 10.2

Browse Source
This commit is contained in:
Alexander Barkov
2019-09-24 19:19:25 +04:00
parent fa9e012a34 5f118b26c8
commit 0a359d7627
33 changed files with 257 additions and 44 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
@@ -377,6 +378,8 @@ parse_arguments() {
append_arg_to_args "$arg"
;;
--defaults-group-suffix=*) defaults_group_suffix="$arg" ;;
--help) usage ;;
*)
@@ -952,7 +955,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"`