Commit 4f90605a authored by Sergei Petrunia's avatar Sergei Petrunia

MariaRocks port: make datetime-aware tests work in any timezone

This fixes
- rocksdb.col_opt_not_null
- rocksdb.col_opt_null
- rocksdb.type_date_time
parent 00e3869a
...@@ -912,7 +912,11 @@ DROP TABLE t1; ...@@ -912,7 +912,11 @@ DROP TABLE t1;
######################## ########################
# date and time columns # date and time columns
######################## ########################
set @col_opt_not_nullsave_time_zone=@@time_zone;
set time_zone='UTC';
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
set @save_time_zone=@@time_zone;
set time_zone='UTC';
CREATE TABLE t1 ( CREATE TABLE t1 (
d DATE NOT NULL, d DATE NOT NULL,
dt DATETIME NOT NULL, dt DATETIME NOT NULL,
...@@ -964,6 +968,7 @@ d dt ts t y y4 y2 ...@@ -964,6 +968,7 @@ d dt ts t y y4 y2
0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 00:00:00 2000 2000 00 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 00:00:00 2000 2000 00
2012-04-09 2012-04-09 05:27:00 2012-04-09 05:27:00 05:27:00 2012 2012 12 2012-04-09 2012-04-09 05:27:00 2012-04-09 05:27:00 05:27:00 2012 2012 12
0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 -838:59:59 0000 0000 00 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 -838:59:59 0000 0000 00
set time_zone=@save_time_zone;
DROP TABLE t1; DROP TABLE t1;
SET TIMESTAMP=UNIX_TIMESTAMP('2013-12-12 12:12:12'); SET TIMESTAMP=UNIX_TIMESTAMP('2013-12-12 12:12:12');
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
...@@ -1201,6 +1206,7 @@ pk HEX(c) ...@@ -1201,6 +1206,7 @@ pk HEX(c)
1 C 1 C
2 C 2 C
DROP TABLE t1; DROP TABLE t1;
set time_zone= @col_opt_not_nullsave_time_zone;
######################## ########################
# ENUM columns # ENUM columns
######################## ########################
......
...@@ -802,7 +802,11 @@ DROP TABLE t1; ...@@ -802,7 +802,11 @@ DROP TABLE t1;
######################## ########################
# date and time columns # date and time columns
######################## ########################
set @col_opt_nullsave_time_zone=@@time_zone;
set time_zone='UTC';
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
set @save_time_zone=@@time_zone;
set time_zone='UTC';
CREATE TABLE t1 ( CREATE TABLE t1 (
d DATE NULL, d DATE NULL,
dt DATETIME NULL, dt DATETIME NULL,
...@@ -854,6 +858,7 @@ d dt ts t y y4 y2 ...@@ -854,6 +858,7 @@ d dt ts t y y4 y2
0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 00:00:00 2000 2000 00 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 00:00:00 2000 2000 00
2012-04-09 2012-04-09 05:27:00 2012-04-09 05:27:00 05:27:00 2012 2012 12 2012-04-09 2012-04-09 05:27:00 2012-04-09 05:27:00 05:27:00 2012 2012 12
0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 -838:59:59 0000 0000 00 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 -838:59:59 0000 0000 00
set time_zone=@save_time_zone;
DROP TABLE t1; DROP TABLE t1;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
CREATE TABLE t1 ( CREATE TABLE t1 (
...@@ -1021,6 +1026,7 @@ pk HEX(c2) ...@@ -1021,6 +1026,7 @@ pk HEX(c2)
2 C 2 C
3 C 3 C
DROP TABLE t1; DROP TABLE t1;
set time_zone=@col_opt_nullsave_time_zone;
######################## ########################
# ENUM columns # ENUM columns
######################## ########################
......
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
set @save_time_zone=@@time_zone;
set time_zone='UTC';
CREATE TABLE t1 ( CREATE TABLE t1 (
d DATE , d DATE ,
dt DATETIME , dt DATETIME ,
...@@ -50,4 +52,5 @@ d dt ts t y y4 y2 ...@@ -50,4 +52,5 @@ d dt ts t y y4 y2
0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 00:00:00 2000 2000 00 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 00:00:00 2000 2000 00
2012-04-09 2012-04-09 05:27:00 2012-04-09 05:27:00 05:27:00 2012 2012 12 2012-04-09 2012-04-09 05:27:00 2012-04-09 05:27:00 05:27:00 2012 2012 12
0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 -838:59:59 0000 0000 00 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 -838:59:59 0000 0000 00
set time_zone=@save_time_zone;
DROP TABLE t1; DROP TABLE t1;
...@@ -92,6 +92,9 @@ let $extra_col_opts = NOT NULL; ...@@ -92,6 +92,9 @@ let $extra_col_opts = NOT NULL;
--echo # date and time columns --echo # date and time columns
--echo ######################## --echo ########################
set @col_opt_not_nullsave_time_zone=@@time_zone;
set time_zone='UTC';
--source type_date_time.inc --source type_date_time.inc
SET TIMESTAMP=UNIX_TIMESTAMP('2013-12-12 12:12:12'); SET TIMESTAMP=UNIX_TIMESTAMP('2013-12-12 12:12:12');
...@@ -123,6 +126,8 @@ SET TIMESTAMP=UNIX_TIMESTAMP('2013-12-12 12:12:12'); ...@@ -123,6 +126,8 @@ SET TIMESTAMP=UNIX_TIMESTAMP('2013-12-12 12:12:12');
--let $col_default = '12' --let $col_default = '12'
--source col_not_null.inc --source col_not_null.inc
set time_zone= @col_opt_not_nullsave_time_zone;
--echo ######################## --echo ########################
--echo # ENUM columns --echo # ENUM columns
--echo ######################## --echo ########################
......
...@@ -88,6 +88,9 @@ let $extra_col_opts = NULL; ...@@ -88,6 +88,9 @@ let $extra_col_opts = NULL;
--echo # date and time columns --echo # date and time columns
--echo ######################## --echo ########################
set @col_opt_nullsave_time_zone=@@time_zone;
set time_zone='UTC';
--source type_date_time.inc --source type_date_time.inc
--let $col_type = DATE --let $col_type = DATE
...@@ -114,6 +117,7 @@ let $extra_col_opts = NULL; ...@@ -114,6 +117,7 @@ let $extra_col_opts = NULL;
--let $col_default = '12' --let $col_default = '12'
--source col_null.inc --source col_null.inc
set time_zone=@col_opt_nullsave_time_zone;
--echo ######################## --echo ########################
--echo # ENUM columns --echo # ENUM columns
......
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
--enable_warnings --enable_warnings
set @save_time_zone=@@time_zone;
set time_zone='UTC';
eval CREATE TABLE t1 ( eval CREATE TABLE t1 (
d DATE $extra_col_opts, d DATE $extra_col_opts,
dt DATETIME $extra_col_opts, dt DATETIME $extra_col_opts,
...@@ -39,6 +40,7 @@ INSERT INTO t1 (d,dt,ts,t,y,y4,y2,pk) VALUES ...@@ -39,6 +40,7 @@ INSERT INTO t1 (d,dt,ts,t,y,y4,y2,pk) VALUES
('999-13-32', '999-11-31 00:00:00', '0', '-839:00:00', '1900', '1900', '-1','2012-12-12 12:12:16'); ('999-13-32', '999-11-31 00:00:00', '0', '-839:00:00', '1900', '1900', '-1','2012-12-12 12:12:16');
SELECT d,dt,ts,t,y,y4,y2 FROM t1; SELECT d,dt,ts,t,y,y4,y2 FROM t1;
set time_zone=@save_time_zone;
DROP TABLE t1; DROP TABLE t1;
......
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