diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-19 11:42:44 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-19 11:42:44 +0200 |
| commit | 44d70c01f0aef419bc1325f0cba6a46085042646 (patch) | |
| tree | d12df15e2f47fbc884591bfec0e14fcb613fd7d3 /scripts | |
| parent | 126725421e56293d7c8b816e066271606b59dcd5 (diff) | |
| parent | 867724fd304caf714d3cd2aa825f2c8b3b724017 (diff) | |
| download | mariadb-git-44d70c01f0aef419bc1325f0cba6a46085042646.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_multi.sh | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 0b33f61710e..77ed36218d3 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -308,7 +308,9 @@ sub report_mysqlds sub start_mysqlds() { - my (@groups, $com, $tmp, $i, @options, $j, $mysqld_found, $info_sent); + my (@groups, $com, $tmp, $i, @options, $j, $mysqld_found, $suffix_found, $info_sent); + + $suffix_found= 0; if (!$opt_no_log) { @@ -327,6 +329,7 @@ sub start_mysqlds() $mysqld_found= 1; # The default $mysqld_found= 0 if (!length($mysqld)); $com= "$mysqld"; + for ($j = 0, $tmp= ""; defined($options[$j]); $j++) { if ("--mysqladmin=" eq substr($options[$j], 0, 13)) @@ -347,6 +350,10 @@ sub start_mysqlds() $options[$j]= quote_shell_word($options[$j]); $tmp.= " $options[$j]"; } + elsif ("--defaults-group-suffix=" eq substr($options[$j], 0, 24)) + { + $suffix_found= 1; + } else { $options[$j]= quote_shell_word($options[$j]); @@ -363,6 +370,12 @@ sub start_mysqlds() $info_sent= 1; } + if (!$suffix_found) + { + $com.= " --defaults-group-suffix="; + $com.= substr($groups[$i],6); + } + $com.= $tmp; if ($opt_wsrep_new_cluster) { |