summaryrefslogtreecommitdiff
path: root/mysql-test/lib
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-10-19 20:29:33 +0200
committerunknown <msvensson@neptunus.(none)>2006-10-19 20:29:33 +0200
commit9ee717874265adf3a070db903f0c0465414f3d5b (patch)
tree77885fdcb02ae60bd6d4a362dcd6143e9f2e999f /mysql-test/lib
parentcd06481d658d77567cbf6223a118e0102b93be51 (diff)
downloadmariadb-git-9ee717874265adf3a070db903f0c0465414f3d5b.tar.gz
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
Diffstat (limited to 'mysql-test/lib')
-rw-r--r--mysql-test/lib/mtr_cases.pl12
1 files changed, 7 insertions, 5 deletions
diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl
index 88c51728fb2..7a01c66305b 100644
--- a/mysql-test/lib/mtr_cases.pl
+++ b/mysql-test/lib/mtr_cases.pl
@@ -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