Commit 0372ca79 authored by petr/cps@outpost.site's avatar petr/cps@outpost.site

fix mysql-test-run.pl to support --timezone option,

which got broken during refactoring.
parent 1b231a17
...@@ -3614,6 +3614,14 @@ sub run_testcase_start_servers($) { ...@@ -3614,6 +3614,14 @@ sub run_testcase_start_servers($) {
return; return;
} }
#
# Set the timezone, in the case it was specified in the test
# We need to do this before the server is started, as mysqld
# uses this information at startup
#
$ENV{'TZ'}= $tinfo->{'timezone'};
if ( $tinfo->{'component_id'} eq 'mysqld' ) if ( $tinfo->{'component_id'} eq 'mysqld' )
{ {
if ( ! $opt_skip_ndbcluster and if ( ! $opt_skip_ndbcluster and
...@@ -3978,7 +3986,6 @@ sub run_mysqltest ($) { ...@@ -3978,7 +3986,6 @@ sub run_mysqltest ($) {
# ------------------------------------------------------- # -------------------------------------------------------
# Init variables that change for each testcase # Init variables that change for each testcase
# ------------------------------------------------------- # -------------------------------------------------------
$ENV{'TZ'}= $tinfo->{'timezone'};
my $res = mtr_run_test($exe,$args,"","",$path_timefile,""); my $res = mtr_run_test($exe,$args,"","",$path_timefile,"");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment