database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

WL#3702

Browse Source
This commit is contained in:
skozlov/ksm@mysql.com/virtop.localdomain
2007-05-11 11:48:34 +04:00
parent 9064773393
commit 73cffa774a
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/mysql-test-run.pl
View File

@ -3850,6 +3850,8 @@ sub mysqld_arguments ($$$$) {
} }
} }
else else
{
if ($mysql_version_id < 50200)
{ {
mtr_add_arg($args, "%s--master-user=root", $prefix); mtr_add_arg($args, "%s--master-user=root", $prefix);
mtr_add_arg($args, "%s--master-connect-retry=1", $prefix); mtr_add_arg($args, "%s--master-connect-retry=1", $prefix);
@ -3857,7 +3859,7 @@ sub mysqld_arguments ($$$$) {
mtr_add_arg($args, "%s--master-password=", $prefix); mtr_add_arg($args, "%s--master-password=", $prefix);
mtr_add_arg($args, "%s--master-port=%d", $prefix, mtr_add_arg($args, "%s--master-port=%d", $prefix,
$master->[0]->{'port'}); # First master $master->[0]->{'port'}); # First master
}
my $slave_server_id= 2 + $idx; my $slave_server_id= 2 + $idx;
my $slave_rpl_rank= $slave_server_id; my $slave_rpl_rank= $slave_server_id;
mtr_add_arg($args, "%s--server-id=%d", $prefix, $slave_server_id); mtr_add_arg($args, "%s--server-id=%d", $prefix, $slave_server_id);