diff options
| author | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-08-04 14:25:58 +0200 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-08-04 14:25:58 +0200 |
| commit | e66ac9a75c4cabb094884c61d354d5d881c53f63 (patch) | |
| tree | 20a64af0a1366afb8836687459286793405b9071 /scripts/mysqld_multi.sh | |
| parent | e3c18b8e849373821b9c009b285ae13ef0fcc1a8 (diff) | |
| download | mariadb-git-bb-10.1-MDEV-21526.tar.gz | |
MDEV-21526: mysqld_multi no longer works with different server binariesbb-10.1-MDEV-21526
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).
Diffstat (limited to 'scripts/mysqld_multi.sh')
| -rw-r--r-- | scripts/mysqld_multi.sh | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 5f359551f0d..3aad68ffb6e 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -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) { |