diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-10-01 09:37:40 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-10-01 09:37:40 +0400 |
| commit | 7e44c455f4de82081af5089e1f77378676aa45ff (patch) | |
| tree | 380cccc03bda084e6a8e38fd7ff6b4304ca8324a /scripts | |
| parent | 6c2724fc05d12904f8c2f58f8dbadd9523d18c96 (diff) | |
| parent | f203245e9edcfb202c1b23fba186be043ce6002d (diff) | |
| download | mariadb-git-7e44c455f4de82081af5089e1f77378676aa45ff.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into 10.3
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_multi.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index b8730e2624a..748925bef0b 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -349,7 +349,7 @@ sub start_mysqlds() $options[$j]= quote_shell_word($options[$j]); $tmp.= " $options[$j]"; } - elseif ("--defaults-group-suffix=" eq substr($options[$j], 0, 24)) + elsif ("--defaults-group-suffix=" eq substr($options[$j], 0, 24)) { $suffix_found= 1; } @@ -368,7 +368,6 @@ sub start_mysqlds() print "wanted mysqld binary.\n\n"; $info_sent= 1; } - $com.= $tmp; if (!$suffix_found) { @@ -376,6 +375,8 @@ sub start_mysqlds() $com.= $groups[$i]; } + $com.= $tmp; + if ($opt_wsrep_new_cluster) { $com.= " --wsrep-new-cluster"; } |