From ba4f663e116c27d4736f30ed1e8651c716620a8a Mon Sep 17 00:00:00 2001 From: Igor Babaev Date: Thu, 18 Mar 2010 23:23:32 -0700 Subject: [PATCH] Made the vcol suite independent on time zone. --- mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc | 1 + mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result | 3 ++- mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc b/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc index 45c7cdb5e41..daf59c38a7e 100644 --- a/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc +++ b/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc @@ -912,6 +912,7 @@ let $rows = 1; let $cols = a long, b datetime as (from_unixtime(a)); let $values1 = 1196440219,default; let $rows = 1; +set time_zone='UTC'; --source suite/vcol/inc/vcol_supported_sql_funcs.inc --echo # GET_FORMAT() diff --git a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result index 8ce67883743..2bc652a7da2 100644 --- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result @@ -2194,6 +2194,7 @@ a b drop table t1; set sql_warnings = 0; # FROM_UNIXTIME() +set time_zone='UTC'; set sql_warnings = 1; create table t1 (a long, b datetime as (from_unixtime(a))); show create table t1; @@ -2205,7 +2206,7 @@ t1 CREATE TABLE `t1` ( insert into t1 values (1196440219,default); select * from t1; a b -1196440219 2007-11-30 08:30:19 +1196440219 2007-11-30 16:30:19 drop table t1; set sql_warnings = 0; # GET_FORMAT() diff --git a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result index 63ba8970a81..a94e220180c 100644 --- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result @@ -2194,6 +2194,7 @@ a b drop table t1; set sql_warnings = 0; # FROM_UNIXTIME() +set time_zone='UTC'; set sql_warnings = 1; create table t1 (a long, b datetime as (from_unixtime(a))); show create table t1; @@ -2205,7 +2206,7 @@ t1 CREATE TABLE `t1` ( insert into t1 values (1196440219,default); select * from t1; a b -1196440219 2007-11-30 08:30:19 +1196440219 2007-11-30 16:30:19 drop table t1; set sql_warnings = 0; # GET_FORMAT()