1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-20614: Syntax error, and option put in wrong place

Browse Source 
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.
This commit is contained in:
Julius Goryavsky 2019-09-25 14:00:39 +02:00
parent 516f7c111b
commit 144217339d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/mysqld_multi.sh
View File

@ -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()
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()
$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";
} }