Commit 526ae03c authored by unknown's avatar unknown
Browse files

add mysql test run (from shell script) option to skip binlogs

parent c2911e94

mysql-test/mysql-test-run.pl

+15 −5
Original line number Diff line number Diff line
@@ -321,6 +321,8 @@ our $opt_with_ndbcluster_slave; 
our $opt_with_ndbcluster_all= 0;

our $opt_with_ndbcluster_only= 0;

our $opt_ndb_extra_test= 0;

our $opt_skip_master_binlog= 0;

our $opt_skip_slave_binlog= 0;



our $exe_ndb_mgm;

our $path_ndb_tools_dir;
@@ -599,6 +601,8 @@ sub command_line_setup () { 
             'with-ndbcluster-all'      => \$opt_with_ndbcluster_all,

             'with-ndbcluster-only'     => \$opt_with_ndbcluster_only,

             'ndb-extra-test'           => \$opt_ndb_extra_test,

             'skip-master-binlog'       => \$opt_skip_master_binlog,

             'skip-slave-binlog'        => \$opt_skip_slave_binlog,

             'do-test=s'                => \$opt_do_test,

             'start-from=s'             => \$opt_start_from,

             'suite=s'                  => \$opt_suite,
@@ -2563,8 +2567,11 @@ sub mysqld_arguments ($$$$$$) { 
  {

    my $id= $idx > 0 ? $idx + 101 : 1;



    if (! $opt_skip_master_binlog)

    {

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

                  $opt_vardir, $sidx);

    }

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

                $master->[$idx]->{'path_mypid'});

    mtr_add_arg($args, "%s--port=%d", $prefix,
@@ -2605,9 +2612,12 @@ sub mysqld_arguments ($$$$$$) { 
    # FIXME slave get this option twice?!

    mtr_add_arg($args, "%s--exit-info=256", $prefix);

    mtr_add_arg($args, "%s--init-rpl-role=slave", $prefix);

    if (! $opt_skip_slave_binlog)

    {

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

                  $opt_vardir, $sidx); # FIXME use own dir for binlogs

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

    }

    # FIXME option duplicated for slave

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

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