mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into outpost.site:/home/cps/mysql/trees/5.1-runtime-bug9191 configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/item_timefunc.cc: Auto merged sql/mysql_priv.h: Auto merged
This commit is contained in:
@ -3621,6 +3621,14 @@ sub run_testcase_start_servers($) {
|
||||
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 ( ! $opt_skip_ndbcluster and
|
||||
@ -3985,7 +3993,6 @@ sub run_mysqltest ($) {
|
||||
# -------------------------------------------------------
|
||||
# Init variables that change for each testcase
|
||||
# -------------------------------------------------------
|
||||
$ENV{'TZ'}= $tinfo->{'timezone'};
|
||||
|
||||
my $res = mtr_run_test($exe,$args,"","",$path_timefile,"");
|
||||
|
||||
|
Reference in New Issue
Block a user