Commit 8a1652aa authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
parents 4d494f8c bf80ec57

mysql-test/mysql-test-run.pl

+18 −9
Original line number Diff line number Diff line
@@ -1208,6 +1208,7 @@ sub kill_running_server () { 
    mkpath("$opt_vardir/log"); # Needed for mysqladmin log

    mtr_kill_leftovers();



    $using_ndbcluster_master= $opt_with_ndbcluster;

    ndbcluster_stop();

    $master->[0]->{'ndbcluster'}= 1;

    ndbcluster_stop_slave();
@@ -1447,6 +1448,7 @@ sub ndbcluster_start ($) { 
  }

  if ( $using_ndbcluster_master )

  {

    # Master already started

    return 0;

  }

  # FIXME, we want to _append_ output to file $file_ndb_testrun_log instead of /dev/null
@@ -1956,6 +1958,7 @@ sub run_testcase ($) { 
  {

    if ( $tinfo->{'master_restart'} or

         $master->[0]->{'running_master_is_special'} or

	 # Stop if cluster is started but test cases does not need cluster

	 ( $tinfo->{'ndb_test'} != $using_ndbcluster_master ) )

    {

      stop_masters();
@@ -2011,6 +2014,10 @@ sub run_testcase ($) { 
    {

      if ( $master->[0]->{'ndbcluster'} )

      {

	# Cluster is not started



	# Call ndbcluster_start to check if test case needs cluster

	# Start it if not already started

	$master->[0]->{'ndbcluster'}= ndbcluster_start($tinfo->{'ndb_test'});

	if ( $master->[0]->{'ndbcluster'} )

	{
@@ -2033,6 +2040,7 @@ sub run_testcase ($) { 
      }

      if ( $using_ndbcluster_master and ! $master->[1]->{'pid'} )

      {

	# Test needs cluster, start an extra mysqld connected to cluster

        mtr_tofile($master->[1]->{'path_myerr'},"CURRENT_TEST: $tname\n");

        $master->[1]->{'pid'}=

          mysqld_start('master',1,$tinfo->{'master_opt'},[],
@@ -2355,11 +2363,11 @@ sub mysqld_arguments ($$$$$$) { 
      mtr_add_arg($args, "%s--skip-innodb", $prefix);

    }



    if ( $opt_skip_ndbcluster )

    if ( $opt_skip_ndbcluster || !$using_ndbcluster)

    {

      mtr_add_arg($args, "%s--skip-ndbcluster", $prefix);

    }

    if ( $using_ndbcluster )

    else

    {

      mtr_add_arg($args, "%s--ndbcluster", $prefix);

      mtr_add_arg($args, "%s--ndb-connectstring=%s", $prefix,
@@ -2549,6 +2557,7 @@ sub mysqld_start ($$$$$) { 
  my $slave_master_info= shift;

  my $using_ndbcluster=  shift;





  my $args;                             # Arg vector

  my $exe;

  my $pid;