Commit 67f51438 authored by Alexander Barkov's avatar Alexander Barkov

MDEV-5431 Test main.ctype_latin2 fails in buildbot

Fixing include/ctype_datetime.inc not to depend on the current time zone.
parent b62bcdd2
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
--echo # Bug#32390 Character sets: casting utf32 to/from date doesn't work --echo # Bug#32390 Character sets: casting utf32 to/from date doesn't work
--echo # --echo #
CREATE TABLE t1 AS SELECT repeat('a',20) AS s1 LIMIT 0; CREATE TABLE t1 AS SELECT repeat('a',20) AS s1 LIMIT 0;
SET time_zone=_latin1'+03:00';
SET timestamp=1216359724; SET timestamp=1216359724;
INSERT INTO t1 VALUES (current_date); INSERT INTO t1 VALUES (current_date);
INSERT INTO t1 VALUES (current_time); INSERT INTO t1 VALUES (current_time);
...@@ -9,6 +10,7 @@ INSERT INTO t1 VALUES (current_timestamp); ...@@ -9,6 +10,7 @@ INSERT INTO t1 VALUES (current_timestamp);
SELECT s1, hex(s1) FROM t1; SELECT s1, hex(s1) FROM t1;
DROP TABLE t1; DROP TABLE t1;
SET timestamp=0; SET timestamp=0;
SET time_zone=default;
--echo # --echo #
--echo # MDEV-5298 Illegal mix of collations on timestamp --echo # MDEV-5298 Illegal mix of collations on timestamp
......
...@@ -564,6 +564,7 @@ DFDFBABBBE ...@@ -564,6 +564,7 @@ DFDFBABBBE
# Bug#32390 Character sets: casting utf32 to/from date doesn't work # Bug#32390 Character sets: casting utf32 to/from date doesn't work
# #
CREATE TABLE t1 AS SELECT repeat('a',20) AS s1 LIMIT 0; CREATE TABLE t1 AS SELECT repeat('a',20) AS s1 LIMIT 0;
SET time_zone=_latin1'+03:00';
SET timestamp=1216359724; SET timestamp=1216359724;
INSERT INTO t1 VALUES (current_date); INSERT INTO t1 VALUES (current_date);
INSERT INTO t1 VALUES (current_time); INSERT INTO t1 VALUES (current_time);
...@@ -571,10 +572,11 @@ INSERT INTO t1 VALUES (current_timestamp); ...@@ -571,10 +572,11 @@ INSERT INTO t1 VALUES (current_timestamp);
SELECT s1, hex(s1) FROM t1; SELECT s1, hex(s1) FROM t1;
s1 hex(s1) s1 hex(s1)
2008-07-18 323030382D30372D3138 2008-07-18 323030382D30372D3138
09:42:04 30393A34323A3034 08:42:04 30383A34323A3034
2008-07-18 09:42:04 323030382D30372D31382030393A34323A3034 2008-07-18 08:42:04 323030382D30372D31382030383A34323A3034
DROP TABLE t1; DROP TABLE t1;
SET timestamp=0; SET timestamp=0;
SET time_zone=default;
# #
# MDEV-5298 Illegal mix of collations on timestamp # MDEV-5298 Illegal mix of collations on timestamp
# #
......
...@@ -4873,6 +4873,7 @@ SET collation_connection=ucs2_general_ci; ...@@ -4873,6 +4873,7 @@ SET collation_connection=ucs2_general_ci;
# Bug#32390 Character sets: casting utf32 to/from date doesn't work # Bug#32390 Character sets: casting utf32 to/from date doesn't work
# #
CREATE TABLE t1 AS SELECT repeat('a',20) AS s1 LIMIT 0; CREATE TABLE t1 AS SELECT repeat('a',20) AS s1 LIMIT 0;
SET time_zone=_latin1'+03:00';
SET timestamp=1216359724; SET timestamp=1216359724;
INSERT INTO t1 VALUES (current_date); INSERT INTO t1 VALUES (current_date);
INSERT INTO t1 VALUES (current_time); INSERT INTO t1 VALUES (current_time);
...@@ -4884,6 +4885,7 @@ s1 hex(s1) ...@@ -4884,6 +4885,7 @@ s1 hex(s1)
2008-07-18 08:42:04 0032003000300038002D00300037002D00310038002000300038003A00340032003A00300034 2008-07-18 08:42:04 0032003000300038002D00300037002D00310038002000300038003A00340032003A00300034
DROP TABLE t1; DROP TABLE t1;
SET timestamp=0; SET timestamp=0;
SET time_zone=default;
# #
# MDEV-5298 Illegal mix of collations on timestamp # MDEV-5298 Illegal mix of collations on timestamp
# #
......
...@@ -1202,6 +1202,7 @@ SET collation_connection=utf16_general_ci; ...@@ -1202,6 +1202,7 @@ SET collation_connection=utf16_general_ci;
# Bug#32390 Character sets: casting utf32 to/from date doesn't work # Bug#32390 Character sets: casting utf32 to/from date doesn't work
# #
CREATE TABLE t1 AS SELECT repeat('a',20) AS s1 LIMIT 0; CREATE TABLE t1 AS SELECT repeat('a',20) AS s1 LIMIT 0;
SET time_zone=_latin1'+03:00';
SET timestamp=1216359724; SET timestamp=1216359724;
INSERT INTO t1 VALUES (current_date); INSERT INTO t1 VALUES (current_date);
INSERT INTO t1 VALUES (current_time); INSERT INTO t1 VALUES (current_time);
...@@ -1213,6 +1214,7 @@ s1 hex(s1) ...@@ -1213,6 +1214,7 @@ s1 hex(s1)
2008-07-18 08:42:04 0032003000300038002D00300037002D00310038002000300038003A00340032003A00300034 2008-07-18 08:42:04 0032003000300038002D00300037002D00310038002000300038003A00340032003A00300034
DROP TABLE t1; DROP TABLE t1;
SET timestamp=0; SET timestamp=0;
SET time_zone=default;
# #
# MDEV-5298 Illegal mix of collations on timestamp # MDEV-5298 Illegal mix of collations on timestamp
# #
......
...@@ -1473,6 +1473,7 @@ drop table t1; ...@@ -1473,6 +1473,7 @@ drop table t1;
# Bug#32390 Character sets: casting utf32 to/from date doesn't work # Bug#32390 Character sets: casting utf32 to/from date doesn't work
# #
CREATE TABLE t1 AS SELECT repeat('a',20) AS s1 LIMIT 0; CREATE TABLE t1 AS SELECT repeat('a',20) AS s1 LIMIT 0;
SET time_zone=_latin1'+03:00';
SET timestamp=1216359724; SET timestamp=1216359724;
INSERT INTO t1 VALUES (current_date); INSERT INTO t1 VALUES (current_date);
INSERT INTO t1 VALUES (current_time); INSERT INTO t1 VALUES (current_time);
...@@ -1484,6 +1485,7 @@ s1 hex(s1) ...@@ -1484,6 +1485,7 @@ s1 hex(s1)
2008-07-18 08:42:04 32003000300038002D00300037002D00310038002000300038003A00340032003A0030003400 2008-07-18 08:42:04 32003000300038002D00300037002D00310038002000300038003A00340032003A0030003400
DROP TABLE t1; DROP TABLE t1;
SET timestamp=0; SET timestamp=0;
SET time_zone=default;
# #
# MDEV-5298 Illegal mix of collations on timestamp # MDEV-5298 Illegal mix of collations on timestamp
# #
......
...@@ -1150,6 +1150,7 @@ SET collation_connection=utf32_general_ci; ...@@ -1150,6 +1150,7 @@ SET collation_connection=utf32_general_ci;
# Bug#32390 Character sets: casting utf32 to/from date doesn't work # Bug#32390 Character sets: casting utf32 to/from date doesn't work
# #
CREATE TABLE t1 AS SELECT repeat('a',20) AS s1 LIMIT 0; CREATE TABLE t1 AS SELECT repeat('a',20) AS s1 LIMIT 0;
SET time_zone=_latin1'+03:00';
SET timestamp=1216359724; SET timestamp=1216359724;
INSERT INTO t1 VALUES (current_date); INSERT INTO t1 VALUES (current_date);
INSERT INTO t1 VALUES (current_time); INSERT INTO t1 VALUES (current_time);
...@@ -1161,6 +1162,7 @@ s1 hex(s1) ...@@ -1161,6 +1162,7 @@ s1 hex(s1)
2008-07-18 08:42:04 000000320000003000000030000000380000002D00000030000000370000002D00000031000000380000002000000030000000380000003A00000034000000320000003A0000003000000034 2008-07-18 08:42:04 000000320000003000000030000000380000002D00000030000000370000002D00000031000000380000002000000030000000380000003A00000034000000320000003A0000003000000034
DROP TABLE t1; DROP TABLE t1;
SET timestamp=0; SET timestamp=0;
SET time_zone=default;
# #
# MDEV-5298 Illegal mix of collations on timestamp # MDEV-5298 Illegal mix of collations on timestamp
# #
......
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