WL#3702

73cffa77 · skozlov/ksm@mysql.com/virtop.localdomain · 90647733 · 73cffa77
Commit 73cffa77 authored May 11, 2007 by skozlov/ksm@mysql.com/virtop.localdomain
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

mysql-test/mysql-test-run.pl mysql-test/mysql-test-run.pl +9 -7

No files found.
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3851,13 +3851,15 @@ sub mysqld_arguments ($$$$) {
    }
    else
    {
-      mtr_add_arg($args, "%s--master-user=root", $prefix);
+      if ($mysql_version_id < 50200)
-      mtr_add_arg($args, "%s--master-connect-retry=1", $prefix);
+      {
-      mtr_add_arg($args, "%s--master-host=127.0.0.1", $prefix);
+        mtr_add_arg($args, "%s--master-user=root", $prefix);
-      mtr_add_arg($args, "%s--master-password=", $prefix);
+        mtr_add_arg($args, "%s--master-connect-retry=1", $prefix);
-      mtr_add_arg($args, "%s--master-port=%d", $prefix,
+        mtr_add_arg($args, "%s--master-host=127.0.0.1", $prefix);
-                  $master->[0]->{'port'}); # First master
+        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);