Commit 14421733 authored by Julius Goryavsky's avatar Julius Goryavsky

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.
parent 516f7c11
...@@ -349,7 +349,7 @@ sub start_mysqlds() ...@@ -349,7 +349,7 @@ sub start_mysqlds()
$options[$j]= quote_shell_word($options[$j]); $options[$j]= quote_shell_word($options[$j]);
$tmp.= " $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; $suffix_found= 1;
} }
...@@ -368,7 +368,6 @@ sub start_mysqlds() ...@@ -368,7 +368,6 @@ sub start_mysqlds()
print "wanted mysqld binary.\n\n"; print "wanted mysqld binary.\n\n";
$info_sent= 1; $info_sent= 1;
} }
$com.= $tmp;
if (!$suffix_found) if (!$suffix_found)
{ {
...@@ -376,6 +375,8 @@ sub start_mysqlds() ...@@ -376,6 +375,8 @@ sub start_mysqlds()
$com.= $groups[$i]; $com.= $groups[$i];
} }
$com.= $tmp;
if ($opt_wsrep_new_cluster) { if ($opt_wsrep_new_cluster) {
$com.= " --wsrep-new-cluster"; $com.= " --wsrep-new-cluster";
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment