diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-09-24 19:19:25 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-09-24 19:19:25 +0400 |
| commit | 0a359d76272bdf74dfbc1bd3bf9e38140cfaa7a1 (patch) | |
| tree | cb6af5b82c6628a47c4ea8be9597346f4a5fb88f /scripts | |
| parent | fa9e012a3412ad93159b69e4c7eb7a2eb5bde37f (diff) | |
| parent | 5f118b26c83960c8fa98bfd544f57ffd76b55304 (diff) | |
| download | mariadb-git-0a359d76272bdf74dfbc1bd3bf9e38140cfaa7a1.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_safe.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index f33592a09f0..290f43e9e84 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -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"` |