Commit b29be567 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools 

into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools


mysql-test/mysql-test-run.pl:
  Auto merged
parents 5a39b93e 091de56e

mysql-test/mysql-test-run.pl

+2 −2
Original line number Diff line number Diff line
@@ -3026,7 +3026,7 @@ sub mysqld_arguments ($$$$$) { 
      mtr_add_arg($args, "%s--ndbcluster", $prefix);

      mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix,

		  $cluster->{'connect_string'});

      if ( $mysql_version_id >= 50000 )

      if ( $mysql_version_id >= 50100 )

      {

	mtr_add_arg($args, "%s--ndb-extra-logging", $prefix);

      }
@@ -3104,7 +3104,7 @@ sub mysqld_arguments ($$$$$) { 
      mtr_add_arg($args, "%s--ndbcluster", $prefix);

      mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix,

		  $clusters->[$slave->[$idx]->{'cluster'}]->{'connect_string'});

      if ( $mysql_version_id >= 50000 )

      if ( $mysql_version_id >= 50100 )

      {

	mtr_add_arg($args, "%s--ndb-extra-logging", $prefix);

      }