mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
MDEV-21526: mysqld_multi no longer works with different server binaries
The problem is caused by the fact that adding the --defaults-group-suffix option to fix MDEV-18863 causes mysqld to read all options from the appropriate sections of the config file, including options specific to mysqld_multi. Reading unknown options (which are not supported by mysqld) causes mysqld to terminate with an error. However, the MDEV-18863 problem has been completely fixed by passing options on the command line, and now there is no need to specify the --defaults-group-suffix option (we just need to give priority to options passed through the command line, so as not to break MDEV-18863).
This commit is contained in:
@ -308,9 +308,7 @@ sub report_mysqlds
|
||||
|
||||
sub start_mysqlds()
|
||||
{
|
||||
my (@groups, $com, $tmp, $i, @options, $j, $mysqld_found, $suffix_found, $info_sent);
|
||||
|
||||
$suffix_found= 0;
|
||||
my (@groups, $com, $tmp, $i, @options, $j, $mysqld_found, $info_sent);
|
||||
|
||||
if (!$opt_no_log)
|
||||
{
|
||||
@ -349,10 +347,6 @@ sub start_mysqlds()
|
||||
$options[$j]= quote_shell_word($options[$j]);
|
||||
$tmp.= " $options[$j]";
|
||||
}
|
||||
elsif ("--defaults-group-suffix=" eq substr($options[$j], 0, 24))
|
||||
{
|
||||
$suffix_found= 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
$options[$j]= quote_shell_word($options[$j]);
|
||||
@ -369,12 +363,6 @@ sub start_mysqlds()
|
||||
$info_sent= 1;
|
||||
}
|
||||
|
||||
if (!$suffix_found)
|
||||
{
|
||||
$com.= " --defaults-group-suffix=";
|
||||
$com.= substr($groups[$i],6);
|
||||
}
|
||||
|
||||
$com.= $tmp;
|
||||
|
||||
if ($opt_wsrep_new_cluster) {
|
||||
|
Reference in New Issue
Block a user