diff options
| author | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2019-09-25 14:00:39 +0200 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2019-09-27 17:14:10 +0200 |
| commit | bc70862e13f32756695d5781c793f2525aeb7187 (patch) | |
| tree | ada8d7af77a01e0089ce011bdba5b00454c52419 | |
| parent | c76873f23ddf4ba36bb14dd3415c3073c51875bf (diff) | |
| download | mariadb-git-bc70862e13f32756695d5781c793f2525aeb7187.tar.gz | |
MDEV-20614: Syntax error, and option put in wrong place
A syntax error in the mysqld_multi.sh script has been fixed
here + a "--defaults-group-suffix" option has been moved to
the top of the mysqld options list.
| -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"; } |