WL#3702

mysql-test/mysql-test-run.pl

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