Commit 9ee71787 authored by unknown's avatar unknown
Browse files

Fix problem running rpl_timezone on powermacg5, it was not popular to set TZ to "" so now it's set 

to a value wich is not our default
parent cd06481d

mysql-test/lib/mtr_cases.pl

+7 −5
Original line number Diff line number Diff line
@@ -263,9 +263,6 @@ sub collect_one_test_case($$$$$$$) { 
    return;

  }



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

  # Skip some tests but include in list, just mark them to skip

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



  my $tinfo= {};

  $tinfo->{'name'}= $tname;
@@ -273,6 +270,10 @@ sub collect_one_test_case($$$$$$$) { 
  $tinfo->{'component_id'} = $component_id;

  push(@$cases, $tinfo);



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

  # Skip some tests but include in list, just mark them to skip

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



  if ( $::opt_skip_test and defined mtr_match_prefix($tname,$::opt_skip_test) )

  {

    $tinfo->{'skip'}= 1;
@@ -356,8 +357,9 @@ sub collect_one_test_case($$$$$$$) { 
      $value= mtr_match_prefix($opt, "--default-time-zone=");

      if ( defined $value )

      {

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

	# Fallthrough, add this option

	# Set timezone for this test case to something different

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

	# Fallthrough, add the --default-time-zone option

      }



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