Commit a60fe75f authored by unknown's avatar unknown
Browse files

Only force mysqld to use log file up until 5.1.6 

After that it will by default use log tables. That setting can be overruled
by adding a -master.opt file like mysql_client_test has.
parent 039f806a

mysql-test/mysql-test-run.pl

+13 −3
Original line number Diff line number Diff line
@@ -3454,6 +3454,12 @@ sub mysqld_arguments ($$$$$) { 
	mtr_add_arg($args, "%s--ndb-extra-logging", $prefix);

      }

    }



    if ( $mysql_version_id <= 50106 )

    {

      # Force mysqld to use log files up until 5.1.6

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

    }

  }



  if ( $type eq 'slave' )
@@ -3471,8 +3477,6 @@ sub mysqld_arguments ($$$$$) { 
      mtr_add_arg($args, "%s--log-slave-updates", $prefix);

    }



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

                $slave->[$idx]->{'path_mylog'});

    mtr_add_arg($args, "%s--master-retry-count=10", $prefix);

    mtr_add_arg($args, "%s--pid-file=%s", $prefix,

                $slave->[$idx]->{'path_pid'});
@@ -3533,6 +3537,13 @@ sub mysqld_arguments ($$$$$) { 
	mtr_add_arg($args, "%s--ndb-extra-logging", $prefix);

      }

    }



    if ( $mysql_version_id <= 50106 )

    {

      # Force mysqld to use log files up until 5.1.6

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

    }



  } # end slave



  if ( $opt_debug )
@@ -3609,7 +3620,6 @@ sub mysqld_arguments ($$$$$) { 
  elsif ( $type eq 'master' )

  {

    mtr_add_arg($args, "%s--open-files-limit=1024", $prefix);

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

  }



  return $args;