maria-developers team mailing list archive

[Igor Babaev <igor@xxxxxxxxxxxx>]

#At lp:maria/5.2 based on revid:igor@xxxxxxxxxxxx-20100317023231-w7h0euroof0lul8e

 2745 Igor Babaev	2010-03-18
      Made the vcol suite independent on time zone. 
      modified:
        mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc
        mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result
        mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result

=== modified file 'mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc'
--- a/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc	2009-10-16 22:57:48 +0000
+++ b/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc	2010-03-19 06:23:32 +0000
@@ -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()

=== modified file 'mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result'
--- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result	2010-03-17 02:32:31 +0000
+++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result	2010-03-19 06:23:32 +0000
@@ -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()

=== modified file 'mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result'
--- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result	2010-03-17 02:32:31 +0000
+++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result	2010-03-19 06:23:32 +0000
@@ -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()