Commit 2aac04f9 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
parents 3cd30397 7bc069d1

mysql-test/mysql-test-run.pl

+10 −0
Original line number Diff line number Diff line
@@ -3554,6 +3554,11 @@ sub mysqld_arguments ($$$$$) { 
      # Force mysqld to use log files up until 5.1.6

      mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'});

    }

    else

    {

      # Turn on logging, will be sent to tables

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

    }

  }



  if ( $type eq 'slave' )
@@ -3637,6 +3642,11 @@ sub mysqld_arguments ($$$$$) { 
      # Force mysqld to use log files up until 5.1.6

      mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'});

    }

    else

    {

      # Turn on logging, will be sent to tables

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

    }



  } # end slave