diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-25 10:14:33 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-25 10:14:33 +0300 |
| commit | d3350c160a7a884e97a5e4a696432230c13d53e0 (patch) | |
| tree | f7f5c35737b4c87dcfac73f7547d0d2321276be9 /scripts/mysqld_safe.sh | |
| parent | a39c4b5f9f7f4d2766f1ddb9487de27259e804a1 (diff) | |
| parent | b6bb64e54a3e34a20cda34e25b6ec62a097955ef (diff) | |
| download | mariadb-git-d3350c160a7a884e97a5e4a696432230c13d53e0.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'scripts/mysqld_safe.sh')
| -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 7612d2b83a6..ef72737766d 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 @@ -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"` |