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

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
parents 1acf0e78 6de718d2

mysql-test/lib/mtr_cases.pl

+2 −5
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ sub collect_one_test_case($$$$$$$) { 
  $tinfo->{'timezone'}= "GMT-3"; # for UNIX_TIMESTAMP tests to work



  $tinfo->{'slave_num'}= 0; # Default, no slave

  $tinfo->{'master_num'}= 1; # Default, 1 master

  if ( defined mtr_match_prefix($tname,"rpl") )

  {

    if ( $::opt_skip_rpl )
@@ -297,13 +298,8 @@ sub collect_one_test_case($$$$$$$) { 
      return;

    }





    $tinfo->{'slave_num'}= 1; # Default for rpl* tests, use one slave



    if ( $tname eq 'rpl_failsafe' or $tname eq 'rpl_chain_temp_table' )

    {

      # $tinfo->{'slave_num'}= 3;         # Not 3 ? Check old code, strange

    }

  }



  if ( defined mtr_match_prefix($tname,"federated") )
@@ -582,6 +578,7 @@ our @tags= 
 ["include/have_debug.inc", "need_debug", 1],

 ["include/have_ndb.inc", "ndb_test", 1],

 ["include/have_ndb_extra.inc", "ndb_extra", 1],

 ["include/have_multi_ndb.inc", "master_num", 2],

 ["require_manager", "require_manager", 1],

);

mysql-test/lib/mtr_process.pl

+2 −1
Original line number Diff line number Diff line
@@ -220,7 +220,8 @@ sub spawn_parent_impl { 
      my $ret_pid= waitpid($pid,0);

      if ( $ret_pid != $pid )

      {

        mtr_error("$path ($pid) got lost somehow");

        mtr_error("waitpid($pid, 0) returned $ret_pid " .

		  "when waiting for '$path'");

      }



      return mtr_process_exit_status($?);

mysql-test/mysql-test-run.pl

+40 −6
Original line number Diff line number Diff line
@@ -231,10 +231,12 @@ our $opt_ndbconnectstring_slave; 
our $opt_record;

my $opt_report_features;

our $opt_check_testcases;

our $opt_mark_progress;



our $opt_skip;

our $opt_skip_rpl;

our $max_slave_num= 0;

our $max_master_num= 0;

our $use_innodb;

our $opt_skip_test;

our $opt_skip_im;
@@ -413,6 +415,15 @@ sub main () { 
	$max_slave_num= $test->{slave_num};

	mtr_error("Too many slaves") if $max_slave_num > 3;

      }



      # Count max number of masters used by a test case

      if ( $test->{master_num} > $max_master_num)

      {

	$max_master_num= $test->{master_num};

	mtr_error("Too many masters") if $max_master_num > 2;

	mtr_error("Too few masters") if $max_master_num < 1;

      }



      $use_innodb||= $test->{'innodb_test'};

    }
@@ -536,6 +547,7 @@ sub command_line_setup () { 
             # Test case authoring

             'record'                   => \$opt_record,

             'check-testcases'          => \$opt_check_testcases,

             'mark-progress'            => \$opt_mark_progress,



             # Extra options used when starting mysqld

             'mysqld=s'                 => \@opt_extra_mysqld_opt,
@@ -1206,6 +1218,19 @@ sub command_line_setup () { 
  $path_ndb_testrun_log= "$opt_vardir/log/ndb_testrun.log";



  $path_snapshot= "$opt_tmpdir/snapshot_$opt_master_myport/";



  if ( $opt_valgrind and $opt_debug )

  {

    # When both --valgrind and --debug is selected, send

    # all output to the trace file, making it possible to

    # see the exact location where valgrind complains

    foreach my $mysqld (@{$master}, @{$slave})

    {

      my $sidx= $mysqld->{idx} ? "$mysqld->{idx}" : "";

      $mysqld->{path_myerr}=

	"$opt_vardir/log/" . $mysqld->{type} . "$sidx.trace";

    }

  }

}



#
@@ -1254,9 +1279,10 @@ sub set_mtr_build_thread_ports($) { 
sub datadir_list_setup () {



  # Make a list of all data_dirs

  @data_dir_lst = (

    $master->[0]->{'path_myddir'},

    $master->[1]->{'path_myddir'});

  for (my $idx= 0; $idx < $max_master_num; $idx++)

  {

    push(@data_dir_lst, $master->[$idx]->{'path_myddir'});

  }



  for (my $idx= 0; $idx < $max_slave_num; $idx++)

  {
@@ -2739,8 +2765,10 @@ sub mysql_install_db () { 


  install_db('master', $master->[0]->{'path_myddir'});



  # FIXME check if testcase really is using second master

  if ($max_master_num)

  {

    copy_install_db('master', $master->[1]->{'path_myddir'});

  }



  # Install the number of slave databses needed

  for (my $idx= 0; $idx < $max_slave_num; $idx++)
@@ -4277,7 +4305,8 @@ sub run_testcase_start_servers($) { 


    }



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

    if ( $clusters->[0]->{'pid'} and ! $master->[1]->{'pid'} and

	 $tinfo->{'master_num'} > 1 )

    {

      # Test needs cluster, start an extra mysqld connected to cluster
@@ -4489,6 +4518,10 @@ sub run_mysqltest ($) { 
  mtr_add_arg($args, "--character-sets-dir=%s", $path_charsetsdir);

  mtr_add_arg($args, "--logdir=%s/log", $opt_vardir);



  # Log line number and time  for each line in .test file

  mtr_add_arg($args, "--mark-progress")

    if $opt_mark_progress;



  if ($tinfo->{'component_id'} eq 'im')

  {

    mtr_add_arg($args, "--socket=%s", $instance_manager->{'path_sock'});
@@ -4944,6 +4977,7 @@ Options for test case authoring 


  record TESTNAME       (Re)genereate the result file for TESTNAME

  check-testcases       Check testcases for sideeffects

  mark-progress         Log line number and elapsed time to <testname>.progress



Options that pass on options