Commit 88820b41 authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
parents ba1f194f a0081378

mysql-test/lib/mtr_cases.pl

+45 −56
Original line number Diff line number Diff line
@@ -152,9 +152,7 @@ sub collect_test_cases ($) { 
    closedir TESTDIR;

  }



  # To speed things up, we sort first in if the test require a restart

  # or not, second in alphanumeric order.



  # Reorder the test cases in an order that wil make them faster to run

  if ( $::opt_reorder )

  {
@@ -207,7 +205,6 @@ sub collect_test_cases ($) { 
	# Append the criteria for sorting, in order of importance.

	#

	push(@criteria, "ndb=" . ($tinfo->{'ndb_test'} ? "1" : "0"));

	push(@criteria, "restart=" . ($tinfo->{'master_restart'} ? "1" : "0"));

	# Group test with equal options together.

	# Ending with "~" makes empty sort later than filled

	push(@criteria, join("!", sort @{$tinfo->{'master_opt'}}) . "~");
@@ -313,18 +310,18 @@ sub collect_one_test_case($$$$$$$) { 
  {

    # This is an ndb test or all tests should be run with ndb cluster started

    $tinfo->{'ndb_test'}= 1;

    if ( $::opt_skip_ndbcluster )

    if ( ! $::opt_ndbcluster_supported )

    {

      # All ndb test's should be skipped

      # Ndb is not supported, skip them

      $tinfo->{'skip'}= 1;

      $tinfo->{'comment'}= "No ndbcluster test(--skip-ndbcluster)";

      $tinfo->{'comment'}= "No ndbcluster support";

      return;

    }

    if ( ! $::opt_ndbcluster_supported )

    elsif ( $::opt_skip_ndbcluster )

    {

      # Ndb is not supported, skip them

      # All ndb test's should be skipped

      $tinfo->{'skip'}= 1;

      $tinfo->{'comment'}= "No ndbcluster support";

      $tinfo->{'comment'}= "No ndbcluster tests(--skip-ndbcluster)";

      return;

    }

  }
@@ -357,52 +354,58 @@ sub collect_one_test_case($$$$$$$) { 


  if ( -f $master_opt_file )

  {

    $tinfo->{'master_restart'}= 1;    # We think so for now



  MASTER_OPT:

    {

    my $master_opt= mtr_get_opts_from_file($master_opt_file);



    foreach my $opt ( @$master_opt )

    {

      my $value;



        # This is a dirty hack from old mysql-test-run, we use the opt

        # file to flag other things as well, it is not a opt list at

        # all

      # The opt file is used both to send special options to the mysqld

      # as well as pass special test case specific options to this

      # script



      $value= mtr_match_prefix($opt, "--timezone=");

      if ( defined $value )

      {

	$tinfo->{'timezone'}= $value;

          last MASTER_OPT;

	next;

      }



      $value= mtr_match_prefix($opt, "--result-file=");

      if ( defined $value )

      {

	# Specifies the file mysqltest should compare

	# output against

	$tinfo->{'result_file'}= "r/$value.result";

          $tinfo->{'master_restart'}= 0;

          last MASTER_OPT;

	next;

      }



      # If we set default time zone, remove the one we have

      $value= mtr_match_prefix($opt, "--default-time-zone=");

      if ( defined $value )

      {

          $tinfo->{'master_opt'}= [];

	$tinfo->{'timezone'}= "";

	# Fallthrough, add this option

      }



      # The --restart option forces a restart even if no special

      # option is set. If the options are the same as next testcase

      # there is no need to restart after the testcase

      # has completed

      if ( $opt eq "--force-restart" )

      {

	$tinfo->{'force_restart'}= 1;

	next;

      }



      # Ok, this was a real option list, add it

      push(@{$tinfo->{'master_opt'}}, @$master_opt);

      # Ok, this was a real option, add it

      push(@{$tinfo->{'master_opt'}}, $opt);

    }

  }



  if ( -f $slave_opt_file )

  {

    $tinfo->{'slave_restart'}= 1;

    my $slave_opt= mtr_get_opts_from_file($slave_opt_file);



    foreach my $opt ( @$slave_opt )
@@ -417,7 +420,6 @@ sub collect_one_test_case($$$$$$$) { 
  if ( -f $slave_mi_file )

  {

    $tinfo->{'slave_mi'}= mtr_get_opts_from_file($slave_mi_file);

    $tinfo->{'slave_restart'}= 1;

  }



  if ( -f $master_sh )
@@ -431,7 +433,6 @@ sub collect_one_test_case($$$$$$$) { 
    else

    {

      $tinfo->{'master_sh'}= $master_sh;

      $tinfo->{'master_restart'}= 1;

    }

  }
@@ -446,7 +447,6 @@ sub collect_one_test_case($$$$$$$) { 
    else

    {

      $tinfo->{'slave_sh'}= $slave_sh;

      $tinfo->{'slave_restart'}= 1;

    }

  }
@@ -551,17 +551,6 @@ sub collect_one_test_case($$$$$$$) { 
      return;

    }

  }



  # We can't restart a running server that may be in use



  if ( $::glob_use_running_server and

       ( $tinfo->{'master_restart'} or $tinfo->{'slave_restart'} ) )

  {

    $tinfo->{'skip'}= 1;

    $tinfo->{'comment'}= "Can't restart a running server";

    return;

  }



}

mysql-test/mysql-test-run.pl

+68 −80
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ use IO::Socket; 
use IO::Socket::INET;

use Data::Dumper;

use strict;

#use diagnostics;

use diagnostics;



our $glob_win32_perl=  ($^O eq "MSWin32"); # ActiveState Win32 Perl

our $glob_cygwin_perl= ($^O eq "cygwin");  # Cygwin Perl
@@ -1357,10 +1357,13 @@ sub executable_setup () { 
    $exe_mysqlslap=      mtr_exe_exists("$path_client_bindir/mysqlslap");

  }



  if ( ! $glob_win32 )

  {

    # Look for mysql_fix_system_table script

    $exe_mysql_fix_system_tables=

      mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables",

			"$path_client_bindir/mysql_fix_privilege_tables");

  }



  if ( ! $opt_skip_ndbcluster)

  {
@@ -1492,11 +1495,13 @@ sub environment_setup () { 
  }



  $ENV{'LD_LIBRARY_PATH'}= join(":", @ld_library_paths,

				split(':', qw($ENV{'LD_LIBRARY_PATH'})));

				$ENV{'LD_LIBRARY_PATHS'} ?

				split(':', $ENV{'LD_LIBRARY_PATH'}) : ());

  mtr_debug("LD_LIBRARY_PATH: $ENV{'LD_LIBRARY_PATH'}");



  $ENV{'DYLD_LIBRARY_PATH'}= join(":", @ld_library_paths,

				split(':', qw($ENV{'DYLD_LIBRARY_PATH'})));

				  $ENV{'DYLD_LIBRARY_PATH'} ?

				  split(':', $ENV{'DYLD_LIBRARY_PATH'}) : ());

  mtr_debug("DYLD_LIBRARY_PATH: $ENV{'DYLD_LIBRARY_PATH'}");
@@ -1527,6 +1532,8 @@ sub environment_setup () { 
  # ----------------------------------------------------

  # Setup env for NDB

  # ----------------------------------------------------

  if ( ! $opt_skip_ndbcluster )

  {

    $ENV{'NDB_MGM'}=                  $exe_ndb_mgm;



    $ENV{'NDBCLUSTER_PORT'}=          $opt_ndbcluster_port;
@@ -1543,6 +1550,7 @@ sub environment_setup () { 
    $ENV{'NDB_EXAMPLES_DIR'}=         $path_ndb_examples_dir;

    $ENV{'MY_NDB_EXAMPLES_BINARY'}=   $exe_ndb_example;

    $ENV{'NDB_EXAMPLES_OUTPUT'}=      $path_ndb_testrun_log;

  }



  # ----------------------------------------------------

  # Setup env for IM
@@ -2817,6 +2825,17 @@ sub run_testcase ($) { 


  if ($master_restart or $slave_restart)

  {

    # Can't restart a running server that may be in use

    if ( $glob_use_running_server )

    {

      $tinfo->{'skip'}= 1;

      $tinfo->{'comment'}= "Can't restart a running server";



      mtr_report_test_name($tinfo);

      mtr_report_test_skipped($tinfo);

      return;

    }



    run_testcase_stop_servers($tinfo, $master_restart, $slave_restart);

  }

  my $died= mtr_record_dead_children();
@@ -2884,15 +2903,12 @@ sub run_testcase ($) { 
  # ----------------------------------------------------------------------

  # Stop Instance Manager if we are processing an IM-test case.

  # ----------------------------------------------------------------------



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

  {

    unless ( mtr_im_stop($instance_manager, $tinfo->{'name'}) )

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

       mtr_im_stop($instance_manager, $tinfo->{'name'}) != 0 )

  {

    mtr_error("Failed to stop Instance Manager.")

  }

}

}





#
@@ -3516,48 +3532,38 @@ sub run_testcase_need_master_restart($) 
  if ( $tinfo->{'master_sh'} )

  {

    $do_restart= 1;           # Always restart if script to run

    mtr_verbose("Restart because: Always restart if script to run");

    mtr_verbose("Restart master: Always restart if script to run");

  }

  if ( $tinfo->{'force_restart'} )

  {

    $do_restart= 1; # Always restart if --force-restart in -opt file

    mtr_verbose("Restart master: Restart forced with --force-restart");

  }

  elsif ( ! $opt_skip_ndbcluster and

	  $tinfo->{'ndb_test'} == 0 and

	  $clusters->[0]->{'pid'} != 0 )

  {

    $do_restart= 1;           # Restart without cluster

    mtr_verbose("Restart because: Test does not need cluster");

    mtr_verbose("Restart master: Test does not need cluster");

  }

  elsif ( ! $opt_skip_ndbcluster and

	  $tinfo->{'ndb_test'} == 1 and

	  $clusters->[0]->{'pid'} == 0 )

  {

    $do_restart= 1;           # Restart with cluster

    mtr_verbose("Restart because: Test need cluster");

    mtr_verbose("Restart master: Test need cluster");

  }

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

  {

    $do_restart= 1;

    mtr_verbose("Restart because: Always restart for im tests");

  }

  elsif ( $master->[0]->{'running_master_is_special'} and

	  $master->[0]->{'running_master_is_special'}->{'timezone'} eq

	  $tinfo->{'timezone'} and

	  mtr_same_opts($master->[0]->{'running_master_is_special'}->{'master_opt'},

			$tinfo->{'master_opt'}) )

  {

    # If running master was started with special settings, but

    # the current test requires the same ones, we *don't* restart.

    $do_restart= 0;

    mtr_verbose("Skip restart: options are equal " .

	       join(" ", @{$tinfo->{'master_opt'}}));

  }

  elsif ( $tinfo->{'master_restart'} )

  {

    $do_restart= 1;

    mtr_verbose("Restart because: master_restart");

    mtr_verbose("Restart master: Always restart for im tests");

  }

  elsif ( $master->[0]->{'running_master_is_special'} )

  elsif ( $master->[0]->{'running_master_options'} and

	  $master->[0]->{'running_master_options'}->{'timezone'} ne

	  $tinfo->{'timezone'})

  {

    $do_restart= 1;

    mtr_verbose("Restart because: running_master_is_special");

    mtr_verbose("Restart master: Different timezone");

  }

  # Check that running master was started with same options

  # as the current test requires
@@ -3565,14 +3571,14 @@ sub run_testcase_need_master_restart($) 
                         $tinfo->{'master_opt'}) )

  {

    $do_restart= 1;

    mtr_verbose("Restart because: running with different options '" .

    mtr_verbose("Restart master: running with different options '" .

	       join(" ", @{$tinfo->{'master_opt'}}) . "' != '" .

		join(" ", @{$master->[0]->{'start_opts'}}) . "'" );

  }

  elsif( ! $master->[0]->{'pid'} )

  {

    $do_restart= 1;

    mtr_verbose("Restart because: master is not started");

    mtr_verbose("Restart master: master is not started");

  }



  return $do_restart;
@@ -3587,7 +3593,7 @@ sub run_testcase_need_slave_restart($) 


  if ( $max_slave_num == 0)

  {

    mtr_verbose("No testcase use slaves, no slave restarts");

    mtr_verbose("Skip slave restart: No testcase use slaves");

  }

  else

  {
@@ -3605,12 +3611,12 @@ sub run_testcase_need_slave_restart($) 


    if ($any_slave_started)

    {

      mtr_verbose("Any slave is started, need to restart");

      mtr_verbose("Restart slave: Slave is started, always restart");

      $do_slave_restart= 1;

    }

    elsif ( $tinfo->{'slave_num'} )

    {

      mtr_verbose("Test need slave, check for restart");

      mtr_verbose("Restart slave: Test need slave");

      $do_slave_restart= 1;

    }

  }
@@ -3632,22 +3638,16 @@ sub run_testcase_need_slave_restart($) 


sub run_testcase_stop_servers($$$) {

  my ($tinfo, $do_restart, $do_slave_restart)= @_;



  if ( $glob_use_running_server || $glob_use_embedded_server )

  {

      return;

  }



  my $pid;

  my %admin_pids; # hash of admin processes that requests shutdown

  my @kill_pids;  # list of processes to shutdown/kill



  # Remember if we restarted for this test case

  # Remember if we restarted for this test case (count restarts)

  $tinfo->{'restarted'}= $do_restart;



  if ( $do_restart )

  {

    delete $master->[0]->{'running_master_is_special'}; # Forget history

    delete $master->[0]->{'running_master_options'}; # Forget history



    # Start shutdown of all started masters

    foreach my $mysqld (@{$master})
@@ -3697,7 +3697,7 @@ sub run_testcase_stop_servers($$$) { 
  if ( $do_restart || $do_slave_restart )

  {



    delete $slave->[0]->{'running_slave_is_special'}; # Forget history

    delete $slave->[0]->{'running_slave_options'}; # Forget history



    # Start shutdown of all started slaves

    foreach my $mysqld (@{$slave})
@@ -3781,18 +3781,13 @@ sub run_testcase_stop_servers($$$) { 


sub run_testcase_start_servers($) {

  my $tinfo= shift;



  my $tname= $tinfo->{'name'};



  if ( $glob_use_running_server or $glob_use_embedded_server )

  {

    return 0;

  }



  # -------------------------------------------------------

  # Init variables that can change between server starts

  # -------------------------------------------------------

  $ENV{'TZ'}= $tinfo->{'timezone'};

  mtr_verbose("Starting server with timezone: $tinfo->{'timezone'}");



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

  {
@@ -3837,11 +3832,8 @@ sub run_testcase_start_servers($) { 
      mysqld_start($master->[1],$tinfo->{'master_opt'},[]);

    }



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

    {

    # Save this test case information, so next can examine it

      $master->[0]->{'running_master_is_special'}= $tinfo;

    }

    $master->[0]->{'running_master_options'}= $tinfo;

  }

  elsif ( ! $opt_skip_im and $tinfo->{'component_id'} eq 'im' )

  {
@@ -3888,12 +3880,8 @@ sub run_testcase_start_servers($) { 
      }

    }



    if ( $tinfo->{'slave_restart'} )

    {

    # Save this test case information, so next can examine it

      $slave->[0]->{'running_slave_is_special'}= $tinfo;

    }



    $slave->[0]->{'running_slave_options'}= $tinfo;

  }



  # Wait for clusters to start
@@ -3969,7 +3957,7 @@ sub run_check_testcase ($$) { 
  my $res = mtr_run_test($exe_mysqltest,$args,

	        "include/check-testcase.test", "", "", "");



  if ( $res == 1  and $mode = "after")

  if ( $res == 1  and $mode eq "after")

  {

    mtr_run("diff",["-u",

		    "$opt_vardir/tmp/$name.result",

mysql-test/t/bdb-alter-table-2-master.opt

+1 −1
Original line number Diff line number Diff line 
--skip-external-locking

--force-restart

mysql-test/t/not_embedded_server-master.opt

+1 −1
Original line number Diff line number Diff line 
--loose-to-force-a-restart
 
--force-restart