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-26 11:11:43 +0200 |
commit | 144217339d8dc2d6e00542cd25d97e39b90afa3f (patch) | |
tree | d797c5e8af652e262d96a04a5c0f9d78bd2011b2 /scripts | |
parent | 516f7c111b0cc3e9ad193c5a4e8c9171a081a362 (diff) | |
download | mariadb-git-144217339d8dc2d6e00542cd25d97e39b90afa3f.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.
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 0bd50c1974f..7cf22bdaf3c 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"; } |