1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-5372 Make "CAST(time_expr AS DATETIME)" compatible with MySQL-5.6 (and the SQL Standard)

Browse Source
This commit is contained in:
Alexander Barkov 2014-03-07 00:21:25 +04:00
parent b95c8ce530
commit 89e1715355
33 changed files with 604 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/my_time.h
View File

@ -77,6 +77,9 @@ extern uchar days_in_month[];
#define MYSQL_TIME_WARN_HAVE_WARNINGS(x) MY_TEST((x) & MYSQL_TIME_WARN_WARNINGS) #define MYSQL_TIME_WARN_HAVE_WARNINGS(x) MY_TEST((x) & MYSQL_TIME_WARN_WARNINGS)
#define MYSQL_TIME_WARN_HAVE_NOTES(x) MY_TEST((x) & MYSQL_TIME_WARN_NOTES) #define MYSQL_TIME_WARN_HAVE_NOTES(x) MY_TEST((x) & MYSQL_TIME_WARN_NOTES)
/* Usefull constants */
#define SECONDS_IN_24H 86400L
/* Limits for the TIME data type */ /* Limits for the TIME data type */
#define TIME_MAX_HOUR 838 #define TIME_MAX_HOUR 838
#define TIME_MAX_MINUTE 59 #define TIME_MAX_MINUTE 59

3
mysql-test/include/type_hrtime.inc
View File

@ -1,6 +1,8 @@
--source include/have_innodb.inc --source include/have_innodb.inc
SET timestamp=UNIX_TIMESTAMP('2001-02-03 10:20:30');
--disable_warnings --disable_warnings
drop table if exists t1, t2, t3; drop table if exists t1, t2, t3;
--enable_warnings --enable_warnings
@ -126,3 +128,4 @@ select * from t2;
drop view v1; drop view v1;
drop table t1, t2; drop table t1, t2;
SET timestamp=DEFAULT;

13
mysql-test/r/cast.result
View File

@ -1,3 +1,4 @@
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
select CAST(1-2 AS UNSIGNED); select CAST(1-2 AS UNSIGNED);
CAST(1-2 AS UNSIGNED) CAST(1-2 AS UNSIGNED)
18446744073709551615 18446744073709551615
@ -62,7 +63,7 @@ cast(12.444 as double)
12.444 12.444
select cast(cast("20:01:01" as time) as datetime); select cast(cast("20:01:01" as time) as datetime);
cast(cast("20:01:01" as time) as datetime) cast(cast("20:01:01" as time) as datetime)
0000-00-00 20:01:01 2001-02-03 20:01:01
select cast(cast("8:46:06.23434" AS time) as decimal(32,10)); select cast(cast("8:46:06.23434" AS time) as decimal(32,10));
cast(cast("8:46:06.23434" AS time) as decimal(32,10)) cast(cast("8:46:06.23434" AS time) as decimal(32,10))
84606.0000000000 84606.0000000000
@ -764,7 +765,7 @@ cast(cast("2101-00-01 02:03:04" as datetime) as time)
02:03:04 02:03:04
SELECT CAST(CAST('20:05:05' AS TIME) as date); SELECT CAST(CAST('20:05:05' AS TIME) as date);
CAST(CAST('20:05:05' AS TIME) as date) CAST(CAST('20:05:05' AS TIME) as date)
0000-00-00 2001-02-03
set sql_mode= TRADITIONAL; set sql_mode= TRADITIONAL;
select cast("2101-00-01 02:03:04" as datetime); select cast("2101-00-01 02:03:04" as datetime);
cast("2101-00-01 02:03:04" as datetime) cast("2101-00-01 02:03:04" as datetime)
@ -778,9 +779,7 @@ Warnings:
Warning 1292 Incorrect datetime value: '2101-00-01 02:03:04' Warning 1292 Incorrect datetime value: '2101-00-01 02:03:04'
SELECT CAST(CAST('20:05:05' AS TIME) as date); SELECT CAST(CAST('20:05:05' AS TIME) as date);
CAST(CAST('20:05:05' AS TIME) as date) CAST(CAST('20:05:05' AS TIME) as date)
NULL 2001-02-03
Warnings:
Warning 1292 Incorrect datetime value: '20:05:05'
set sql_mode=DEFAULT; set sql_mode=DEFAULT;
create table t1 (f1 time, f2 date, f3 datetime); create table t1 (f1 time, f2 date, f3 datetime);
insert into t1 values ('11:22:33','2011-12-13','2011-12-13 11:22:33'); insert into t1 values ('11:22:33','2011-12-13','2011-12-13 11:22:33');
@ -790,9 +789,7 @@ cast(f1 as unsigned) cast(f2 as unsigned) cast(f3 as unsigned)
drop table t1; drop table t1;
SELECT CAST(TIME('10:20:30') AS DATE) + INTERVAL 1 DAY; SELECT CAST(TIME('10:20:30') AS DATE) + INTERVAL 1 DAY;
CAST(TIME('10:20:30') AS DATE) + INTERVAL 1 DAY CAST(TIME('10:20:30') AS DATE) + INTERVAL 1 DAY
NULL 2001-02-04
Warnings:
Warning 1292 Incorrect datetime value: '0000-00-00'
SET SQL_MODE=ALLOW_INVALID_DATES; SET SQL_MODE=ALLOW_INVALID_DATES;
SELECT DATE("foo"); SELECT DATE("foo");
DATE("foo") DATE("foo")

8
mysql-test/r/dyncol.result
View File

@ -697,14 +697,14 @@ column_get(column_create(1, 0), 1 as datetime)
select column_get(column_create(1, "2001021"), 1 as datetime); select column_get(column_create(1, "2001021"), 1 as datetime);
column_get(column_create(1, "2001021"), 1 as datetime) column_get(column_create(1, "2001021"), 1 as datetime)
2020-01-02 01:00:00 2020-01-02 01:00:00
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
select column_get(column_create(1, "8:46:06.23434" AS time), 1 as datetime); select column_get(column_create(1, "8:46:06.23434" AS time), 1 as datetime);
column_get(column_create(1, "8:46:06.23434" AS time), 1 as datetime) column_get(column_create(1, "8:46:06.23434" AS time), 1 as datetime)
0000-00-00 08:46:06 2001-02-03 08:46:06
select column_get(column_create(1, "-808:46:06.23434" AS time), 1 as datetime); select column_get(column_create(1, "-808:46:06.23434" AS time), 1 as datetime);
column_get(column_create(1, "-808:46:06.23434" AS time), 1 as datetime) column_get(column_create(1, "-808:46:06.23434" AS time), 1 as datetime)
NULL 2000-12-31 07:13:53
Warnings: SET timestamp=DEFAULT;
Warning 1292 Truncated incorrect datetime value: '-808:46:06'
set @@sql_mode="allow_invalid_dates"; set @@sql_mode="allow_invalid_dates";
select column_get(column_create(1, "2011-02-30 18:46:06.23434" AS CHAR), 1 as datetime); select column_get(column_create(1, "2011-02-30 18:46:06.23434" AS CHAR), 1 as datetime);
column_get(column_create(1, "2011-02-30 18:46:06.23434" AS CHAR), 1 as datetime) column_get(column_create(1, "2011-02-30 18:46:06.23434" AS CHAR), 1 as datetime)

36
mysql-test/r/func_time.result
View File

@ -1719,6 +1719,8 @@ create table t1(a time);
insert into t1 values ('00:00:00'),('00:01:00'); insert into t1 values ('00:00:00'),('00:01:00');
select 1 from t1 where 1 < some (select cast(a as datetime) from t1); select 1 from t1 where 1 < some (select cast(a as datetime) from t1);
1 1
1
1
drop table t1; drop table t1;
select time('10:10:10') > 10; select time('10:10:10') > 10;
time('10:10:10') > 10 time('10:10:10') > 10
@ -1853,9 +1855,11 @@ Warnings:
Warning 1292 Incorrect datetime value: '0' Warning 1292 Incorrect datetime value: '0'
Warning 1292 Incorrect datetime value: '0' Warning 1292 Incorrect datetime value: '0'
drop table t1; drop table t1;
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
select convert_tz(timediff('0000-00-00 00:00:00', cast('2008-03-26 07:09:06' as datetime)), 'UTC', 'Europe/Moscow'); select convert_tz(timediff('0000-00-00 00:00:00', cast('2008-03-26 07:09:06' as datetime)), 'UTC', 'Europe/Moscow');
convert_tz(timediff('0000-00-00 00:00:00', cast('2008-03-26 07:09:06' as datetime)), 'UTC', 'Europe/Moscow') convert_tz(timediff('0000-00-00 00:00:00', cast('2008-03-26 07:09:06' as datetime)), 'UTC', 'Europe/Moscow')
NULL NULL
SET timestamp=DEFAULT;
create table t1 (f1 integer, f2 date); create table t1 (f1 integer, f2 date);
insert into t1 values (1,'2011-05-05'),(2,'2011-05-05'),(3,'2011-05-05'),(4,'2011-05-05'),(5,'2011-05-05'),(6, '2011-05-06'); insert into t1 values (1,'2011-05-05'),(2,'2011-05-05'),(3,'2011-05-05'),(4,'2011-05-05'),(5,'2011-05-05'),(6, '2011-05-06');
select * from t1 where 1 and concat(f2)=MAKEDATE(2011, 125); select * from t1 where 1 and concat(f2)=MAKEDATE(2011, 125);
@ -2330,6 +2334,7 @@ SELECT * FROM t1;
TIMESTAMP('2001-01-01 00:00:00','10:10:10') TIMESTAMP('2001-01-01 00:00:00.1','10:10:10') TIMESTAMP('2001-01-01 00:00:00.12','10:10:10') TIMESTAMP('2001-01-01 00:00:00.123','10:10:10') TIMESTAMP('2001-01-01 00:00:00.1234','10:10:10') TIMESTAMP('2001-01-01 00:00:00.12345','10:10:10') TIMESTAMP('2001-01-01 00:00:00.123456','10:10:10') TIMESTAMP('2001-01-01 00:00:00.1234567','10:10:10') TIMESTAMP('2001-01-01 00:00:00','10:10:10') TIMESTAMP('2001-01-01 00:00:00.1','10:10:10') TIMESTAMP('2001-01-01 00:00:00.12','10:10:10') TIMESTAMP('2001-01-01 00:00:00.123','10:10:10') TIMESTAMP('2001-01-01 00:00:00.1234','10:10:10') TIMESTAMP('2001-01-01 00:00:00.12345','10:10:10') TIMESTAMP('2001-01-01 00:00:00.123456','10:10:10') TIMESTAMP('2001-01-01 00:00:00.1234567','10:10:10')
2001-01-01 10:10:10 2001-01-01 10:10:10.1 2001-01-01 10:10:10.12 2001-01-01 10:10:10.123 2001-01-01 10:10:10.1234 2001-01-01 10:10:10.12345 2001-01-01 10:10:10.123456 2001-01-01 10:10:10.123456 2001-01-01 10:10:10 2001-01-01 10:10:10.1 2001-01-01 10:10:10.12 2001-01-01 10:10:10.123 2001-01-01 10:10:10.1234 2001-01-01 10:10:10.12345 2001-01-01 10:10:10.123456 2001-01-01 10:10:10.123456
DROP TABLE t1; DROP TABLE t1;
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
CREATE TABLE t1 AS SELECT CREATE TABLE t1 AS SELECT
TIMESTAMP('00:00:00','10:10:10'), TIMESTAMP('00:00:00','10:10:10'),
TIMESTAMP(TIME('00:00:00'),'10:10:10'); TIMESTAMP(TIME('00:00:00'),'10:10:10');
@ -2339,8 +2344,9 @@ TIMESTAMP('00:00:00','10:10:10') datetime YES NULL
TIMESTAMP(TIME('00:00:00'),'10:10:10') datetime YES NULL TIMESTAMP(TIME('00:00:00'),'10:10:10') datetime YES NULL
SELECT * FROM t1; SELECT * FROM t1;
TIMESTAMP('00:00:00','10:10:10') TIMESTAMP(TIME('00:00:00'),'10:10:10') TIMESTAMP('00:00:00','10:10:10') TIMESTAMP(TIME('00:00:00'),'10:10:10')
NULL NULL NULL 2001-02-03 10:10:10
DROP TABLE t1; DROP TABLE t1;
SET timestamp=DEFAULT;
# #
# MDEV-4869 Wrong result of MAKETIME(0, 0, -0.1) # MDEV-4869 Wrong result of MAKETIME(0, 0, -0.1)
# #
@ -2350,6 +2356,7 @@ NULL
# #
# MDEV-4857 Wrong result of HOUR('1 00:00:00') # MDEV-4857 Wrong result of HOUR('1 00:00:00')
# #
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
SELECT HOUR('1 02:00:00'), HOUR('26:00:00'); SELECT HOUR('1 02:00:00'), HOUR('26:00:00');
HOUR('1 02:00:00') HOUR('26:00:00') HOUR('1 02:00:00') HOUR('26:00:00')
26 26 26 26
@ -2361,7 +2368,7 @@ HOUR(TIME('1 02:00:00')) HOUR(TIME('26:00:00'))
26 26 26 26
SELECT DAY(TIME('1 02:00:00')), DAY(TIME('26:00:00')); SELECT DAY(TIME('1 02:00:00')), DAY(TIME('26:00:00'));
DAY(TIME('1 02:00:00')) DAY(TIME('26:00:00')) DAY(TIME('1 02:00:00')) DAY(TIME('26:00:00'))
0 0 4 4
SELECT EXTRACT(HOUR FROM '1 02:00:00'), EXTRACT(HOUR FROM '26:00:00'); SELECT EXTRACT(HOUR FROM '1 02:00:00'), EXTRACT(HOUR FROM '26:00:00');
EXTRACT(HOUR FROM '1 02:00:00') EXTRACT(HOUR FROM '26:00:00') EXTRACT(HOUR FROM '1 02:00:00') EXTRACT(HOUR FROM '26:00:00')
2 2 2 2
@ -2374,6 +2381,7 @@ EXTRACT(HOUR FROM TIME('1 02:00:00')) EXTRACT(HOUR FROM TIME('26:00:00'))
SELECT EXTRACT(DAY FROM TIME('1 02:00:00')), EXTRACT(DAY FROM TIME('26:00:00')); SELECT EXTRACT(DAY FROM TIME('1 02:00:00')), EXTRACT(DAY FROM TIME('26:00:00'));
EXTRACT(DAY FROM TIME('1 02:00:00')) EXTRACT(DAY FROM TIME('26:00:00')) EXTRACT(DAY FROM TIME('1 02:00:00')) EXTRACT(DAY FROM TIME('26:00:00'))
1 1 1 1
SET timestamp=DEFAULT;
# #
# MDEV-5458 RQG hits 'sql/tztime.cc:799: my_time_t sec_since_epoch(int, int, int, int, int, int): Assertion `mon > 0 && mon < 13' failed.' # MDEV-5458 RQG hits 'sql/tztime.cc:799: my_time_t sec_since_epoch(int, int, int, int, int, int): Assertion `mon > 0 && mon < 13' failed.'
# #
@ -2382,13 +2390,11 @@ CREATE TABLE t1 (t TIME);
INSERT INTO t1 VALUES ('03:22:30'),('18:30:05'); INSERT INTO t1 VALUES ('03:22:30'),('18:30:05');
SELECT CONVERT_TZ(GREATEST(t, CURRENT_DATE()), '+02:00', '+10:00') FROM t1; SELECT CONVERT_TZ(GREATEST(t, CURRENT_DATE()), '+02:00', '+10:00') FROM t1;
CONVERT_TZ(GREATEST(t, CURRENT_DATE()), '+02:00', '+10:00') CONVERT_TZ(GREATEST(t, CURRENT_DATE()), '+02:00', '+10:00')
NULL 2014-02-26 06:59:59
NULL 2014-02-26 06:59:59
Warnings: Warnings:
Warning 1292 Truncated incorrect time value: '1296:00:00' Warning 1292 Truncated incorrect time value: '1296:00:00'
Warning 1292 Incorrect datetime value: '838:59:59'
Warning 1292 Truncated incorrect time value: '1296:00:00' Warning 1292 Truncated incorrect time value: '1296:00:00'
Warning 1292 Incorrect datetime value: '838:59:59'
SELECT GREATEST(t, CURRENT_DATE()) FROM t1; SELECT GREATEST(t, CURRENT_DATE()) FROM t1;
GREATEST(t, CURRENT_DATE()) GREATEST(t, CURRENT_DATE())
838:59:59 838:59:59
@ -2446,30 +2452,32 @@ SELECT CAST(ADDTIME(CASE WHEN 0 THEN a ELSE b END,0) AS CHAR) FROM t1;
CAST(ADDTIME(CASE WHEN 0 THEN a ELSE b END,0) AS CHAR) CAST(ADDTIME(CASE WHEN 0 THEN a ELSE b END,0) AS CHAR)
2012-12-21 00:00:00 2012-12-21 00:00:00
DROP TABLE t1; DROP TABLE t1;
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
CREATE TABLE t1 (a DATETIME, b TIME); CREATE TABLE t1 (a DATETIME, b TIME);
INSERT INTO t1 VALUES (NULL, '00:20:12'); INSERT INTO t1 VALUES (NULL, '00:20:12');
SELECT IF(1,ADDDATE(IFNULL(a,b),0),1) FROM t1; SELECT IF(1,ADDDATE(IFNULL(a,b),0),1) FROM t1;
IF(1,ADDDATE(IFNULL(a,b),0),1) IF(1,ADDDATE(IFNULL(a,b),0),1)
0000-00-00 00:20:12 2001-02-03 00:20:12
SELECT CAST(ADDDATE(IFNULL(a,b),0) AS CHAR) FROM t1; SELECT CAST(ADDDATE(IFNULL(a,b),0) AS CHAR) FROM t1;
CAST(ADDDATE(IFNULL(a,b),0) AS CHAR) CAST(ADDDATE(IFNULL(a,b),0) AS CHAR)
0000-00-00 00:20:12 2001-02-03 00:20:12
SELECT CAST(ADDDATE(COALESCE(a,b),0) AS CHAR) FROM t1; SELECT CAST(ADDDATE(COALESCE(a,b),0) AS CHAR) FROM t1;
CAST(ADDDATE(COALESCE(a,b),0) AS CHAR) CAST(ADDDATE(COALESCE(a,b),0) AS CHAR)
0000-00-00 00:20:12 2001-02-03 00:20:12
SELECT CAST(ADDDATE(CASE WHEN 0 THEN a ELSE b END,0) AS CHAR) FROM t1; SELECT CAST(ADDDATE(CASE WHEN 0 THEN a ELSE b END,0) AS CHAR) FROM t1;
CAST(ADDDATE(CASE WHEN 0 THEN a ELSE b END,0) AS CHAR) CAST(ADDDATE(CASE WHEN 0 THEN a ELSE b END,0) AS CHAR)
0000-00-00 00:20:12 2001-02-03 00:20:12
SELECT IF(1,ADDTIME(IFNULL(a,b),0),1) FROM t1; SELECT IF(1,ADDTIME(IFNULL(a,b),0),1) FROM t1;
IF(1,ADDTIME(IFNULL(a,b),0),1) IF(1,ADDTIME(IFNULL(a,b),0),1)
NULL 2001-02-03 00:20:12
SELECT CAST(ADDTIME(IFNULL(a,b),0) AS CHAR) FROM t1; SELECT CAST(ADDTIME(IFNULL(a,b),0) AS CHAR) FROM t1;
CAST(ADDTIME(IFNULL(a,b),0) AS CHAR) CAST(ADDTIME(IFNULL(a,b),0) AS CHAR)
NULL 2001-02-03 00:20:12
SELECT CAST(ADDTIME(COALESCE(a,b),0) AS CHAR) FROM t1; SELECT CAST(ADDTIME(COALESCE(a,b),0) AS CHAR) FROM t1;
CAST(ADDTIME(COALESCE(a,b),0) AS CHAR) CAST(ADDTIME(COALESCE(a,b),0) AS CHAR)
NULL 2001-02-03 00:20:12
SELECT CAST(ADDTIME(CASE WHEN 0 THEN a ELSE b END,0) AS CHAR) FROM t1; SELECT CAST(ADDTIME(CASE WHEN 0 THEN a ELSE b END,0) AS CHAR) FROM t1;
CAST(ADDTIME(CASE WHEN 0 THEN a ELSE b END,0) AS CHAR) CAST(ADDTIME(CASE WHEN 0 THEN a ELSE b END,0) AS CHAR)
NULL 2001-02-03 00:20:12
DROP TABLE t1; DROP TABLE t1;
SET timestamp=DEFAULT;

80
mysql-test/r/old-mode.result
View File

@ -19,3 +19,83 @@ drop table t1,t2;
SHOW PROCESSLIST; SHOW PROCESSLIST;
Id User Host db Command Time State Info Id User Host db Command Time State Info
<Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST <Id> root <Host> test Query <Time> <State> SHOW PROCESSLIST
#
# MDEV-5372 Make "CAST(time_expr AS DATETIME)" compatible with the SQL Standard)
#
SELECT CAST(TIME'-10:30:30' AS DATETIME);
CAST(TIME'-10:30:30' AS DATETIME)
NULL
Warnings:
Warning 1292 Truncated incorrect datetime value: '-10:30:30'
SELECT CAST(TIME'10:20:30' AS DATETIME);
CAST(TIME'10:20:30' AS DATETIME)
0000-00-00 10:20:30
SELECT CAST(TIME'830:20:30' AS DATETIME);
CAST(TIME'830:20:30' AS DATETIME)
0000-01-03 14:20:30
CREATE TABLE t1 (a DATETIME);
INSERT INTO t1 VALUES (TIME'-10:20:30');
Warnings:
Warning 1265 Data truncated for column 'a' at row 1
INSERT INTO t1 VALUES (TIME'10:20:30');
INSERT INTO t1 VALUES (TIME'830:20:30');
SELECT * FROM t1;
a
0000-00-00 00:00:00
0000-00-00 10:20:30
0000-01-03 14:20:30
DROP TABLE t1;
CREATE TABLE t1 (a TIMESTAMP);
INSERT INTO t1 VALUES (TIME'-10:20:30');
Warnings:
Warning 1265 Data truncated for column 'a' at row 1
INSERT INTO t1 VALUES (TIME'10:20:30');
Warnings:
Warning 1265 Data truncated for column 'a' at row 1
INSERT INTO t1 VALUES (TIME'830:20:30');
Warnings:
Warning 1264 Out of range value for column 'a' at row 1
SELECT * FROM t1;
a
0000-00-00 00:00:00
0000-00-00 00:00:00
0000-00-00 00:00:00
DROP TABLE t1;
CREATE TABLE t1 (a TIME);
INSERT INTO t1 VALUES (TIME'-10:20:30');
INSERT INTO t1 VALUES (TIME'10:20:30');
INSERT INTO t1 VALUES (TIME'830:20:30');
SELECT a, CAST(a AS DATETIME), TO_DAYS(a) FROM t1;
a CAST(a AS DATETIME) TO_DAYS(a)
-10:20:30 NULL NULL
10:20:30 0000-00-00 10:20:30 NULL
830:20:30 0000-01-03 14:20:30 NULL
Warnings:
Warning 1292 Truncated incorrect datetime value: '-10:20:30'
Warning 1264 Out of range value for column 'a' at row 1
Warning 1264 Out of range value for column 'a' at row 2
Warning 1264 Out of range value for column 'a' at row 3
DROP TABLE t1;
SELECT TO_DAYS(TIME'-10:20:30');
TO_DAYS(TIME'-10:20:30')
NULL
Warnings:
Warning 1292 Truncated incorrect datetime value: '-10:20:30'
SELECT TO_DAYS(TIME'10:20:30');
TO_DAYS(TIME'10:20:30')
NULL
Warnings:
Warning 1292 Truncated incorrect datetime value: '10:20:30'
SELECT TO_DAYS(TIME'830:20:30');
TO_DAYS(TIME'830:20:30')
3
CREATE TABLE t1 (a DATETIME, b TIME);
INSERT INTO t1 VALUES (NULL, '00:20:12');
INSERT INTO t1 VALUES (NULL, '-00:20:12');
SELECT IF(1,ADDDATE(IFNULL(a,b),0),1) FROM t1;
IF(1,ADDDATE(IFNULL(a,b),0),1)
0000-00-00 00:20:12
NULL
Warnings:
Warning 1292 Truncated incorrect datetime value: '-00:20:12'
DROP TABLE t1;

34
mysql-test/r/temporal_literal.result
View File

@ -371,49 +371,35 @@ DROP TABLE t1;
# #
# TIME literals in no-zero date context # TIME literals in no-zero date context
# #
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
SELECT TO_DAYS(TIME'00:00:00'); SELECT TO_DAYS(TIME'00:00:00');
TO_DAYS(TIME'00:00:00') TO_DAYS(TIME'00:00:00')
NULL 730884
Warnings:
Warning 1292 Incorrect datetime value: '00:00:00'
SELECT TO_SECONDS(TIME'00:00:00'); SELECT TO_SECONDS(TIME'00:00:00');
TO_SECONDS(TIME'00:00:00') TO_SECONDS(TIME'00:00:00')
NULL 63148377600
Warnings:
Warning 1292 Incorrect datetime value: '00:00:00'
SELECT DAYOFYEAR(TIME'00:00:00'); SELECT DAYOFYEAR(TIME'00:00:00');
DAYOFYEAR(TIME'00:00:00') DAYOFYEAR(TIME'00:00:00')
NULL 34
Warnings:
Warning 1292 Incorrect datetime value: '00:00:00'
SELECT WEEK(TIME'00:00:00'); SELECT WEEK(TIME'00:00:00');
WEEK(TIME'00:00:00') WEEK(TIME'00:00:00')
NULL 4
Warnings:
Warning 1292 Incorrect datetime value: '00:00:00'
SELECT YEARWEEK(TIME'00:00:00'); SELECT YEARWEEK(TIME'00:00:00');
YEARWEEK(TIME'00:00:00') YEARWEEK(TIME'00:00:00')
NULL 200104
Warnings:
Warning 1292 Incorrect datetime value: '00:00:00'
SELECT WEEKDAY(TIME'00:00:00'); SELECT WEEKDAY(TIME'00:00:00');
WEEKDAY(TIME'00:00:00') WEEKDAY(TIME'00:00:00')
NULL 5
Warnings:
Warning 1292 Incorrect datetime value: '00:00:00'
SELECT CONVERT_TZ(TIME'00:00:00','+00:00','+01:00'); SELECT CONVERT_TZ(TIME'00:00:00','+00:00','+01:00');
CONVERT_TZ(TIME'00:00:00','+00:00','+01:00') CONVERT_TZ(TIME'00:00:00','+00:00','+01:00')
NULL 2001-02-03 01:00:00
Warnings:
Warning 1292 Incorrect datetime value: '00:00:00'
SELECT DATE_ADD(TIME'00:00:00', INTERVAL 1 HOUR); SELECT DATE_ADD(TIME'00:00:00', INTERVAL 1 HOUR);
DATE_ADD(TIME'00:00:00', INTERVAL 1 HOUR) DATE_ADD(TIME'00:00:00', INTERVAL 1 HOUR)
01:00:00 01:00:00
SELECT TIMESTAMPDIFF(SECOND,TIME'00:00:00', TIME'00:00:00'); SELECT TIMESTAMPDIFF(SECOND,TIME'00:00:00', TIME'00:00:00');
TIMESTAMPDIFF(SECOND,TIME'00:00:00', TIME'00:00:00') TIMESTAMPDIFF(SECOND,TIME'00:00:00', TIME'00:00:00')
NULL 0
Warnings: SET timestamp=DEFAULT;
Warning 1292 Incorrect datetime value: '00:00:00'
# #
# Testing Item_func::fix_fields() # Testing Item_func::fix_fields()
# #

10
mysql-test/r/timezone2.result
View File

@ -315,16 +315,14 @@ End of 5.1 tests
# #
# MDEV-4653 Wrong result for CONVERT_TZ(TIME('00:00:00'),'+00:00','+7:5') # MDEV-4653 Wrong result for CONVERT_TZ(TIME('00:00:00'),'+00:00','+7:5')
# #
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
SELECT CONVERT_TZ(TIME('00:00:00'),'+00:00','+7:5'); SELECT CONVERT_TZ(TIME('00:00:00'),'+00:00','+7:5');
CONVERT_TZ(TIME('00:00:00'),'+00:00','+7:5') CONVERT_TZ(TIME('00:00:00'),'+00:00','+7:5')
NULL 2001-02-03 07:05:00
Warnings:
Warning 1292 Incorrect datetime value: '00:00:00'
SELECT CONVERT_TZ(TIME('2010-01-01 00:00:00'),'+00:00','+7:5'); SELECT CONVERT_TZ(TIME('2010-01-01 00:00:00'),'+00:00','+7:5');
CONVERT_TZ(TIME('2010-01-01 00:00:00'),'+00:00','+7:5') CONVERT_TZ(TIME('2010-01-01 00:00:00'),'+00:00','+7:5')
NULL 2001-02-03 07:05:00
Warnings: SET timestamp=DEFAULT;
Warning 1292 Incorrect datetime value: '00:00:00'
# #
# MDEV-5506 safe_mutex: Trying to lock unitialized mutex at safemalloc.c on server shutdown after SELECT with CONVERT_TZ # MDEV-5506 safe_mutex: Trying to lock unitialized mutex at safemalloc.c on server shutdown after SELECT with CONVERT_TZ
# #

6
mysql-test/r/type_datetime_hires.result
View File

@ -1,3 +1,4 @@
SET timestamp=UNIX_TIMESTAMP('2001-02-03 10:20:30');
drop table if exists t1, t2, t3; drop table if exists t1, t2, t3;
create table t1 (a datetime(7)); create table t1 (a datetime(7));
ERROR 42000: Too big precision 7 specified for 'a'. Maximum is 6. ERROR 42000: Too big precision 7 specified for 'a'. Maximum is 6.
@ -197,7 +198,7 @@ bigint_f5_datetime 20101112111417
varchar_f6_datetime 2010-11-12 11:14:17.765432 varchar_f6_datetime 2010-11-12 11:14:17.765432
alter table t1 modify time4_f0_datetime datetime(0), modify datetime3_f1_datetime datetime(1), modify date_f2_datetime datetime(2), modify double_f3_datetime datetime(3), modify decimal5_f4_datetime datetime(4), modify bigint_f5_datetime datetime(5), modify varchar_f6_datetime datetime(6); alter table t1 modify time4_f0_datetime datetime(0), modify datetime3_f1_datetime datetime(1), modify date_f2_datetime datetime(2), modify double_f3_datetime datetime(3), modify decimal5_f4_datetime datetime(4), modify bigint_f5_datetime datetime(5), modify varchar_f6_datetime datetime(6);
select * from t1; select * from t1;
time4_f0_datetime 0000-00-00 11:14:17 time4_f0_datetime 2001-02-03 11:14:17
datetime3_f1_datetime 2010-11-12 11:14:17.7 datetime3_f1_datetime 2010-11-12 11:14:17.7
date_f2_datetime 2010-11-12 00:00:00.00 date_f2_datetime 2010-11-12 00:00:00.00
double_f3_datetime 2010-11-12 11:14:17.766 double_f3_datetime 2010-11-12 11:14:17.766
@ -207,7 +208,7 @@ varchar_f6_datetime 2010-11-12 11:14:17.765432
delete from t1; delete from t1;
insert t1 select * from t2; insert t1 select * from t2;
select * from t1; select * from t1;
time4_f0_datetime 0000-00-00 11:14:17 time4_f0_datetime 2001-02-03 11:14:17
datetime3_f1_datetime 2010-11-12 11:14:17.7 datetime3_f1_datetime 2010-11-12 11:14:17.7
date_f2_datetime 2010-11-12 00:00:00.00 date_f2_datetime 2010-11-12 00:00:00.00
double_f3_datetime 2010-11-12 11:14:17.765 double_f3_datetime 2010-11-12 11:14:17.765
@ -262,6 +263,7 @@ a b
2011-01-02 03:04:06.234500 2011-01-02 03:04:06.234561 2011-01-02 03:04:06.234500 2011-01-02 03:04:06.234561
drop view v1; drop view v1;
drop table t1, t2; drop table t1, t2;
SET timestamp=DEFAULT;
CREATE TABLE t1 ( CREATE TABLE t1 (
taken datetime(5) NOT NULL DEFAULT '0000-00-00 00:00:00', taken datetime(5) NOT NULL DEFAULT '0000-00-00 00:00:00',
id int(11) NOT NULL DEFAULT '0', id int(11) NOT NULL DEFAULT '0',

10
mysql-test/r/type_time.result
View File

@ -144,12 +144,14 @@ End of 5.0 tests
# #
# Bug#53942 valgrind warnings with timestamp() function and incomplete datetime values # Bug#53942 valgrind warnings with timestamp() function and incomplete datetime values
# #
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
CREATE TABLE t1(f1 TIME); CREATE TABLE t1(f1 TIME);
INSERT INTO t1 VALUES ('23:38:57'); INSERT INTO t1 VALUES ('23:38:57');
SELECT TIMESTAMP(f1,'1') FROM t1; SELECT TIMESTAMP(f1,'1') FROM t1;
TIMESTAMP(f1,'1') TIMESTAMP(f1,'1')
NULL 2001-02-03 23:38:58
DROP TABLE t1; DROP TABLE t1;
SET timestamp=DEFAULT;
End of 5.1 tests End of 5.1 tests
create table t1 (a time); create table t1 (a time);
insert t1 values (-131415); insert t1 values (-131415);
@ -177,11 +179,11 @@ drop table t1;
# #
# MDEV-4634 Crash in CONVERT_TZ # MDEV-4634 Crash in CONVERT_TZ
# #
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
SELECT CONVERT_TZ(GREATEST(TIME('00:00:00'),TIME('00:00:00')),'+00:00','+7:5'); SELECT CONVERT_TZ(GREATEST(TIME('00:00:00'),TIME('00:00:00')),'+00:00','+7:5');
CONVERT_TZ(GREATEST(TIME('00:00:00'),TIME('00:00:00')),'+00:00','+7:5') CONVERT_TZ(GREATEST(TIME('00:00:00'),TIME('00:00:00')),'+00:00','+7:5')
NULL 2001-02-03 07:05:00
Warnings: SET timestamp=DEFAULT;
Warning 1292 Incorrect datetime value: '00:00:00'
# #
# MDEV-4652 Wrong result for CONCAT(GREATEST(TIME('00:00:01'),TIME('00:00:00'))) # MDEV-4652 Wrong result for CONCAT(GREATEST(TIME('00:00:01'),TIME('00:00:00')))
# #

28
mysql-test/r/type_time_hires.result
View File

@ -1,3 +1,4 @@
SET timestamp=UNIX_TIMESTAMP('2001-02-03 10:20:30');
drop table if exists t1, t2, t3; drop table if exists t1, t2, t3;
create table t1 (a time(7)); create table t1 (a time(7));
ERROR 42000: Too big precision 7 specified for 'a'. Maximum is 6. ERROR 42000: Too big precision 7 specified for 'a'. Maximum is 6.
@ -194,8 +195,8 @@ f5_time 11:14:17.76543
f6_time 11:14:17.765432 f6_time 11:14:17.765432
select cast(f0_time as time(4)) time4_f0_time, cast(f1_time as datetime(3)) datetime3_f1_time, cast(f2_time as date) date_f2_time, cast(f4_time as double) double_f3_time, cast(f4_time as decimal(40,5)) decimal5_f4_time, cast(f5_time as signed) bigint_f5_time, cast(f6_time as char(255)) varchar_f6_time from t1; select cast(f0_time as time(4)) time4_f0_time, cast(f1_time as datetime(3)) datetime3_f1_time, cast(f2_time as date) date_f2_time, cast(f4_time as double) double_f3_time, cast(f4_time as decimal(40,5)) decimal5_f4_time, cast(f5_time as signed) bigint_f5_time, cast(f6_time as char(255)) varchar_f6_time from t1;
time4_f0_time 11:14:17.0000 time4_f0_time 11:14:17.0000
datetime3_f1_time 0000-00-00 11:14:17.700 datetime3_f1_time 2001-02-03 11:14:17.700
date_f2_time 0000-00-00 date_f2_time 2001-02-03
double_f3_time 111417.7654 double_f3_time 111417.7654
decimal5_f4_time 111417.76540 decimal5_f4_time 111417.76540
bigint_f5_time 111417 bigint_f5_time 111417
@ -208,8 +209,8 @@ Code 1265
Message Data truncated for column 'date_f2_time' at row 1 Message Data truncated for column 'date_f2_time' at row 1
select * from t2; select * from t2;
time4_f0_time 11:14:17.0000 time4_f0_time 11:14:17.0000
datetime3_f1_time 0000-00-00 11:14:17.700 datetime3_f1_time 2001-02-03 11:14:17.700
date_f2_time 0000-00-00 date_f2_time 2001-02-03
double_f3_time 111417.765 double_f3_time 111417.765
decimal5_f4_time 111417.76540 decimal5_f4_time 111417.76540
bigint_f5_time 111417 bigint_f5_time 111417
@ -221,13 +222,20 @@ Code 1265
Message Data truncated for column 'date_f2_time' at row 1 Message Data truncated for column 'date_f2_time' at row 1
select * from t1; select * from t1;
time4_f0_time 11:14:17.0000 time4_f0_time 11:14:17.0000
datetime3_f1_time 0000-00-00 11:14:17.700 datetime3_f1_time 2001-02-03 11:14:17.700
date_f2_time 0000-00-00 date_f2_time 2001-02-03
double_f3_time 111417.765 double_f3_time 111417.765
decimal5_f4_time 111417.76540 decimal5_f4_time 111417.76540
bigint_f5_time 111417 bigint_f5_time 111417
varchar_f6_time 11:14:17.765432 varchar_f6_time 11:14:17.765432
alter table t1 modify time4_f0_time time(0), modify datetime3_f1_time time(1), modify date_f2_time time(2), modify double_f3_time time(3), modify decimal5_f4_time time(4), modify bigint_f5_time time(5), modify varchar_f6_time time(6); alter table t1 modify time4_f0_time time(0), modify datetime3_f1_time time(1), modify date_f2_time time(2), modify double_f3_time time(3), modify decimal5_f4_time time(4), modify bigint_f5_time time(5), modify varchar_f6_time time(6);
Warnings:
Level Note
Code 1265
Message Data truncated for column 'datetime3_f1_time' at row 1
Level Note
Code 1265
Message Data truncated for column 'date_f2_time' at row 1
select * from t1; select * from t1;
time4_f0_time 11:14:17 time4_f0_time 11:14:17
datetime3_f1_time 11:14:17.7 datetime3_f1_time 11:14:17.7
@ -238,6 +246,13 @@ bigint_f5_time 11:14:17.00000
varchar_f6_time 11:14:17.765432 varchar_f6_time 11:14:17.765432
delete from t1; delete from t1;
insert t1 select * from t2; insert t1 select * from t2;
Warnings:
Level Note
Code 1265
Message Data truncated for column 'datetime3_f1_time' at row 1
Level Note
Code 1265
Message Data truncated for column 'date_f2_time' at row 1
select * from t1; select * from t1;
time4_f0_time 11:14:17 time4_f0_time 11:14:17
datetime3_f1_time 11:14:17.7 datetime3_f1_time 11:14:17.7
@ -301,6 +316,7 @@ a b
04:05:06.000000 04:05:06.789100 04:05:06.000000 04:05:06.789100
drop view v1; drop view v1;
drop table t1, t2; drop table t1, t2;
SET timestamp=DEFAULT;
create table t1 (a time(4) not null, key(a)); create table t1 (a time(4) not null, key(a));
insert into t1 values ('1:2:3.001'),('1:2:3'), ('-00:00:00.6'),('-00:00:00.7'),('-00:00:00.8'),('-00:00:00.9'),('-00:00:01.0'),('-00:00:01.1'),('-00:00:01.000000'),('-00:00:01.100001'),('-00:00:01.000002'),('-00:00:01.090000'); insert into t1 values ('1:2:3.001'),('1:2:3'), ('-00:00:00.6'),('-00:00:00.7'),('-00:00:00.8'),('-00:00:00.9'),('-00:00:01.0'),('-00:00:01.1'),('-00:00:01.000000'),('-00:00:01.100001'),('-00:00:01.000002'),('-00:00:01.090000');
select * from t1 order by a; select * from t1 order by a;

14
mysql-test/r/type_timestamp_hires.result
View File

@ -1,3 +1,4 @@
SET timestamp=UNIX_TIMESTAMP('2001-02-03 10:20:30');
drop table if exists t1, t2, t3; drop table if exists t1, t2, t3;
create table t1 (a timestamp(7)); create table t1 (a timestamp(7));
ERROR 42000: Too big precision 7 specified for 'a'. Maximum is 6. ERROR 42000: Too big precision 7 specified for 'a'. Maximum is 6.
@ -196,12 +197,8 @@ decimal5_f4_timestamp 20101112111417.76540
bigint_f5_timestamp 20101112111417 bigint_f5_timestamp 20101112111417
varchar_f6_timestamp 2010-11-12 11:14:17.765432 varchar_f6_timestamp 2010-11-12 11:14:17.765432
alter table t1 modify time4_f0_timestamp timestamp(0), modify datetime3_f1_timestamp timestamp(1), modify date_f2_timestamp timestamp(2), modify double_f3_timestamp timestamp(3), modify decimal5_f4_timestamp timestamp(4), modify bigint_f5_timestamp timestamp(5), modify varchar_f6_timestamp timestamp(6); alter table t1 modify time4_f0_timestamp timestamp(0), modify datetime3_f1_timestamp timestamp(1), modify date_f2_timestamp timestamp(2), modify double_f3_timestamp timestamp(3), modify decimal5_f4_timestamp timestamp(4), modify bigint_f5_timestamp timestamp(5), modify varchar_f6_timestamp timestamp(6);
Warnings:
Level Warning
Code 1265
Message Data truncated for column 'time4_f0_timestamp' at row 1
select * from t1; select * from t1;
time4_f0_timestamp 0000-00-00 00:00:00 time4_f0_timestamp 2001-02-03 11:14:17
datetime3_f1_timestamp 2010-11-12 11:14:17.7 datetime3_f1_timestamp 2010-11-12 11:14:17.7
date_f2_timestamp 2010-11-12 00:00:00.00 date_f2_timestamp 2010-11-12 00:00:00.00
double_f3_timestamp 2010-11-12 11:14:17.766 double_f3_timestamp 2010-11-12 11:14:17.766
@ -210,12 +207,8 @@ bigint_f5_timestamp 2010-11-12 11:14:17.00000
varchar_f6_timestamp 2010-11-12 11:14:17.765432 varchar_f6_timestamp 2010-11-12 11:14:17.765432
delete from t1; delete from t1;
insert t1 select * from t2; insert t1 select * from t2;
Warnings:
Level Warning
Code 1265
Message Data truncated for column 'time4_f0_timestamp' at row 1
select * from t1; select * from t1;
time4_f0_timestamp 0000-00-00 00:00:00 time4_f0_timestamp 2001-02-03 11:14:17
datetime3_f1_timestamp 2010-11-12 11:14:17.7 datetime3_f1_timestamp 2010-11-12 11:14:17.7
date_f2_timestamp 2010-11-12 00:00:00.00 date_f2_timestamp 2010-11-12 00:00:00.00
double_f3_timestamp 2010-11-12 11:14:17.765 double_f3_timestamp 2010-11-12 11:14:17.765
@ -270,6 +263,7 @@ a b
2011-01-02 03:04:06.234500 2011-01-02 03:04:06.234561 2011-01-02 03:04:06.234500 2011-01-02 03:04:06.234561
drop view v1; drop view v1;
drop table t1, t2; drop table t1, t2;
SET timestamp=DEFAULT;
set time_zone='+03:00'; set time_zone='+03:00';
set timestamp=unix_timestamp('2011-01-01 01:01:01') + 0.123456; set timestamp=unix_timestamp('2011-01-01 01:01:01') + 0.123456;
create table t1 (a timestamp(5)); create table t1 (a timestamp(5));

38
mysql-test/suite/funcs_1/r/innodb_func_view.result
View File

@ -1,3 +1,4 @@
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
DROP TABLE IF EXISTS t1_selects, t1_modes, t1_values; DROP TABLE IF EXISTS t1_selects, t1_modes, t1_values;
DROP VIEW IF EXISTS v1; DROP VIEW IF EXISTS v1;
CREATE TABLE t1_values CREATE TABLE t1_values
@ -3936,12 +3937,10 @@ my_time, id FROM t1_values
WHERE select_id = 46 OR select_id IS NULL order by id; WHERE select_id = 46 OR select_id IS NULL order by id;
CAST(my_time AS DATETIME) my_time id CAST(my_time AS DATETIME) my_time id
NULL NULL 1 NULL NULL 1
NULL -838:59:59 2 2000-12-30 01:00:01 -838:59:59 2
0000-01-03 22:59:59 838:59:59 3 2001-03-09 22:59:59 838:59:59 3
0000-00-00 13:00:00 13:00:00 4 2001-02-03 13:00:00 13:00:00 4
0000-00-00 10:00:00 10:00:00 5 2001-02-03 10:00:00 10:00:00 5
Warnings:
Warning 1292 Truncated incorrect datetime value: '-838:59:59'
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -3950,12 +3949,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
WHERE select_id = 46 OR select_id IS NULL) order by id; WHERE select_id = 46 OR select_id IS NULL) order by id;
CAST(my_time AS DATETIME) my_time id CAST(my_time AS DATETIME) my_time id
NULL NULL 1 NULL NULL 1
NULL -838:59:59 2 2000-12-30 01:00:01 -838:59:59 2
0000-01-03 22:59:59 838:59:59 3 2001-03-09 22:59:59 838:59:59 3
0000-00-00 13:00:00 13:00:00 4 2001-02-03 13:00:00 13:00:00 4
0000-00-00 10:00:00 10:00:00 5 2001-02-03 10:00:00 10:00:00 5
Warnings:
Warning 1292 Truncated incorrect datetime value: '-838:59:59'
DROP VIEW v1; DROP VIEW v1;
@ -4302,10 +4299,10 @@ my_time, id FROM t1_values
WHERE select_id = 35 OR select_id IS NULL order by id; WHERE select_id = 35 OR select_id IS NULL order by id;
CAST(my_time AS DATE) my_time id CAST(my_time AS DATE) my_time id
NULL NULL 1 NULL NULL 1
0000-00-00 -838:59:59 2 2000-12-30 -838:59:59 2
0000-00-00 838:59:59 3 2001-03-09 838:59:59 3
0000-00-00 13:00:00 4 2001-02-03 13:00:00 4
0000-00-00 10:00:00 5 2001-02-03 10:00:00 5
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as date) AS `CAST(my_time AS DATE)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as date) AS `CAST(my_time AS DATE)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -4314,10 +4311,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
WHERE select_id = 35 OR select_id IS NULL) order by id; WHERE select_id = 35 OR select_id IS NULL) order by id;
CAST(my_time AS DATE) my_time id CAST(my_time AS DATE) my_time id
NULL NULL 1 NULL NULL 1
0000-00-00 -838:59:59 2 2000-12-30 -838:59:59 2
0000-00-00 838:59:59 3 2001-03-09 838:59:59 3
0000-00-00 13:00:00 4 2001-02-03 13:00:00 4
0000-00-00 10:00:00 5 2001-02-03 10:00:00 5
DROP VIEW v1; DROP VIEW v1;
@ -5280,3 +5277,4 @@ DROP VIEW v1;
DROP TABLE t1_selects, t1_modes, t1_values; DROP TABLE t1_selects, t1_modes, t1_values;
SET timestamp=DEFAULT;

38
mysql-test/suite/funcs_1/r/memory_func_view.result
View File

@ -1,4 +1,5 @@
SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION'; SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
DROP TABLE IF EXISTS t1_selects, t1_modes, t1_values; DROP TABLE IF EXISTS t1_selects, t1_modes, t1_values;
DROP VIEW IF EXISTS v1; DROP VIEW IF EXISTS v1;
CREATE TABLE t1_values CREATE TABLE t1_values
@ -3937,12 +3938,10 @@ my_time, id FROM t1_values
WHERE select_id = 46 OR select_id IS NULL order by id; WHERE select_id = 46 OR select_id IS NULL order by id;
CAST(my_time AS DATETIME) my_time id CAST(my_time AS DATETIME) my_time id
NULL NULL 1 NULL NULL 1
NULL -838:59:59 2 2000-12-30 01:00:01 -838:59:59 2
0000-01-03 22:59:59 838:59:59 3 2001-03-09 22:59:59 838:59:59 3
0000-00-00 13:00:00 13:00:00 4 2001-02-03 13:00:00 13:00:00 4
0000-00-00 10:00:00 10:00:00 5 2001-02-03 10:00:00 10:00:00 5
Warnings:
Warning 1292 Truncated incorrect datetime value: '-838:59:59'
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -3951,12 +3950,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
WHERE select_id = 46 OR select_id IS NULL) order by id; WHERE select_id = 46 OR select_id IS NULL) order by id;
CAST(my_time AS DATETIME) my_time id CAST(my_time AS DATETIME) my_time id
NULL NULL 1 NULL NULL 1
NULL -838:59:59 2 2000-12-30 01:00:01 -838:59:59 2
0000-01-03 22:59:59 838:59:59 3 2001-03-09 22:59:59 838:59:59 3
0000-00-00 13:00:00 13:00:00 4 2001-02-03 13:00:00 13:00:00 4
0000-00-00 10:00:00 10:00:00 5 2001-02-03 10:00:00 10:00:00 5
Warnings:
Warning 1292 Truncated incorrect datetime value: '-838:59:59'
DROP VIEW v1; DROP VIEW v1;
@ -4303,10 +4300,10 @@ my_time, id FROM t1_values
WHERE select_id = 35 OR select_id IS NULL order by id; WHERE select_id = 35 OR select_id IS NULL order by id;
CAST(my_time AS DATE) my_time id CAST(my_time AS DATE) my_time id
NULL NULL 1 NULL NULL 1
0000-00-00 -838:59:59 2 2000-12-30 -838:59:59 2
0000-00-00 838:59:59 3 2001-03-09 838:59:59 3
0000-00-00 13:00:00 4 2001-02-03 13:00:00 4
0000-00-00 10:00:00 5 2001-02-03 10:00:00 5
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as date) AS `CAST(my_time AS DATE)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as date) AS `CAST(my_time AS DATE)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -4315,10 +4312,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
WHERE select_id = 35 OR select_id IS NULL) order by id; WHERE select_id = 35 OR select_id IS NULL) order by id;
CAST(my_time AS DATE) my_time id CAST(my_time AS DATE) my_time id
NULL NULL 1 NULL NULL 1
0000-00-00 -838:59:59 2 2000-12-30 -838:59:59 2
0000-00-00 838:59:59 3 2001-03-09 838:59:59 3
0000-00-00 13:00:00 4 2001-02-03 13:00:00 4
0000-00-00 10:00:00 5 2001-02-03 10:00:00 5
DROP VIEW v1; DROP VIEW v1;
@ -5281,3 +5278,4 @@ DROP VIEW v1;
DROP TABLE t1_selects, t1_modes, t1_values; DROP TABLE t1_selects, t1_modes, t1_values;
SET timestamp=DEFAULT;

38
mysql-test/suite/funcs_1/r/myisam_func_view.result
View File

@ -1,4 +1,5 @@
SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION'; SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
DROP TABLE IF EXISTS t1_selects, t1_modes, t1_values; DROP TABLE IF EXISTS t1_selects, t1_modes, t1_values;
DROP VIEW IF EXISTS v1; DROP VIEW IF EXISTS v1;
CREATE TABLE t1_values CREATE TABLE t1_values
@ -3937,12 +3938,10 @@ my_time, id FROM t1_values
WHERE select_id = 46 OR select_id IS NULL order by id; WHERE select_id = 46 OR select_id IS NULL order by id;
CAST(my_time AS DATETIME) my_time id CAST(my_time AS DATETIME) my_time id
NULL NULL 1 NULL NULL 1
NULL -838:59:59 2 2000-12-30 01:00:01 -838:59:59 2
0000-01-03 22:59:59 838:59:59 3 2001-03-09 22:59:59 838:59:59 3
0000-00-00 13:00:00 13:00:00 4 2001-02-03 13:00:00 13:00:00 4
0000-00-00 10:00:00 10:00:00 5 2001-02-03 10:00:00 10:00:00 5
Warnings:
Warning 1292 Truncated incorrect datetime value: '-838:59:59'
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -3951,12 +3950,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
WHERE select_id = 46 OR select_id IS NULL) order by id; WHERE select_id = 46 OR select_id IS NULL) order by id;
CAST(my_time AS DATETIME) my_time id CAST(my_time AS DATETIME) my_time id
NULL NULL 1 NULL NULL 1
NULL -838:59:59 2 2000-12-30 01:00:01 -838:59:59 2
0000-01-03 22:59:59 838:59:59 3 2001-03-09 22:59:59 838:59:59 3
0000-00-00 13:00:00 13:00:00 4 2001-02-03 13:00:00 13:00:00 4
0000-00-00 10:00:00 10:00:00 5 2001-02-03 10:00:00 10:00:00 5
Warnings:
Warning 1292 Truncated incorrect datetime value: '-838:59:59'
DROP VIEW v1; DROP VIEW v1;
@ -4303,10 +4300,10 @@ my_time, id FROM t1_values
WHERE select_id = 35 OR select_id IS NULL order by id; WHERE select_id = 35 OR select_id IS NULL order by id;
CAST(my_time AS DATE) my_time id CAST(my_time AS DATE) my_time id
NULL NULL 1 NULL NULL 1
0000-00-00 -838:59:59 2 2000-12-30 -838:59:59 2
0000-00-00 838:59:59 3 2001-03-09 838:59:59 3
0000-00-00 13:00:00 4 2001-02-03 13:00:00 4
0000-00-00 10:00:00 5 2001-02-03 10:00:00 5
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as date) AS `CAST(my_time AS DATE)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_time` as date) AS `CAST(my_time AS DATE)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -4315,10 +4312,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
WHERE select_id = 35 OR select_id IS NULL) order by id; WHERE select_id = 35 OR select_id IS NULL) order by id;
CAST(my_time AS DATE) my_time id CAST(my_time AS DATE) my_time id
NULL NULL 1 NULL NULL 1
0000-00-00 -838:59:59 2 2000-12-30 -838:59:59 2
0000-00-00 838:59:59 3 2001-03-09 838:59:59 3
0000-00-00 13:00:00 4 2001-02-03 13:00:00 4
0000-00-00 10:00:00 5 2001-02-03 10:00:00 5
DROP VIEW v1; DROP VIEW v1;
@ -5281,3 +5278,4 @@ DROP VIEW v1;
DROP TABLE t1_selects, t1_modes, t1_values; DROP TABLE t1_selects, t1_modes, t1_values;
SET timestamp=DEFAULT;

4
mysql-test/suite/funcs_1/views/func_view.inc
View File

@ -151,6 +151,8 @@
# #
# #
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS t1_selects, t1_modes, t1_values; DROP TABLE IF EXISTS t1_selects, t1_modes, t1_values;
DROP VIEW IF EXISTS v1; DROP VIEW IF EXISTS v1;
@ -1359,3 +1361,5 @@ while ($select_id)
--enable_ps_protocol --enable_ps_protocol
DROP TABLE t1_selects, t1_modes, t1_values; DROP TABLE t1_selects, t1_modes, t1_values;
SET timestamp=DEFAULT;

3
mysql-test/t/cast.test
View File

@ -2,6 +2,9 @@
# Test of cast function # Test of cast function
# #
# For TIME->DATETIME conversion
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
select CAST(1-2 AS UNSIGNED); select CAST(1-2 AS UNSIGNED);
select CAST(CAST(1-2 AS UNSIGNED) AS SIGNED INTEGER); select CAST(CAST(1-2 AS UNSIGNED) AS SIGNED INTEGER);
select CAST('10 ' as unsigned integer); select CAST('10 ' as unsigned integer);

2
mysql-test/t/dyncol.test
View File

@ -248,8 +248,10 @@ select column_get(column_create(1, "20010203"), 1 as datetime);
select column_get(column_create(1, 0), 1 as datetime); select column_get(column_create(1, 0), 1 as datetime);
select column_get(column_create(1, "2001021"), 1 as datetime); select column_get(column_create(1, "2001021"), 1 as datetime);
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
select column_get(column_create(1, "8:46:06.23434" AS time), 1 as datetime); select column_get(column_create(1, "8:46:06.23434" AS time), 1 as datetime);
select column_get(column_create(1, "-808:46:06.23434" AS time), 1 as datetime); select column_get(column_create(1, "-808:46:06.23434" AS time), 1 as datetime);
SET timestamp=DEFAULT;
set @@sql_mode="allow_invalid_dates"; set @@sql_mode="allow_invalid_dates";
select column_get(column_create(1, "2011-02-30 18:46:06.23434" AS CHAR), 1 as datetime); select column_get(column_create(1, "2011-02-30 18:46:06.23434" AS CHAR), 1 as datetime);

8
mysql-test/t/func_time.test
View File

@ -1103,7 +1103,9 @@ drop table t1;
# #
# lp:731815 Crash/valgrind warning Item::send with 5.1-micro # lp:731815 Crash/valgrind warning Item::send with 5.1-micro
# #
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
select convert_tz(timediff('0000-00-00 00:00:00', cast('2008-03-26 07:09:06' as datetime)), 'UTC', 'Europe/Moscow'); select convert_tz(timediff('0000-00-00 00:00:00', cast('2008-03-26 07:09:06' as datetime)), 'UTC', 'Europe/Moscow');
SET timestamp=DEFAULT;
# #
# lp:736370 Datetime functions in subquery context cause wrong result and bogus warnings in mysql-5.1-micr # lp:736370 Datetime functions in subquery context cause wrong result and bogus warnings in mysql-5.1-micr
@ -1425,12 +1427,14 @@ SHOW COLUMNS FROM t1;
SELECT * FROM t1; SELECT * FROM t1;
DROP TABLE t1; DROP TABLE t1;
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
CREATE TABLE t1 AS SELECT CREATE TABLE t1 AS SELECT
TIMESTAMP('00:00:00','10:10:10'), TIMESTAMP('00:00:00','10:10:10'),
TIMESTAMP(TIME('00:00:00'),'10:10:10'); TIMESTAMP(TIME('00:00:00'),'10:10:10');
SHOW COLUMNS FROM t1; SHOW COLUMNS FROM t1;
SELECT * FROM t1; SELECT * FROM t1;
DROP TABLE t1; DROP TABLE t1;
SET timestamp=DEFAULT;
--echo # --echo #
--echo # MDEV-4869 Wrong result of MAKETIME(0, 0, -0.1) --echo # MDEV-4869 Wrong result of MAKETIME(0, 0, -0.1)
@ -1440,6 +1444,7 @@ SELECT MAKETIME(0, 0, -0.1);
--echo # --echo #
--echo # MDEV-4857 Wrong result of HOUR('1 00:00:00') --echo # MDEV-4857 Wrong result of HOUR('1 00:00:00')
--echo # --echo #
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
SELECT HOUR('1 02:00:00'), HOUR('26:00:00'); SELECT HOUR('1 02:00:00'), HOUR('26:00:00');
SELECT HOUR(TIME'1 02:00:00'), HOUR(TIME'26:00:00'); SELECT HOUR(TIME'1 02:00:00'), HOUR(TIME'26:00:00');
SELECT HOUR(TIME('1 02:00:00')), HOUR(TIME('26:00:00')); SELECT HOUR(TIME('1 02:00:00')), HOUR(TIME('26:00:00'));
@ -1449,6 +1454,7 @@ SELECT EXTRACT(HOUR FROM '1 02:00:00'), EXTRACT(HOUR FROM '26:00:00');
SELECT EXTRACT(HOUR FROM TIME'1 02:00:00'), EXTRACT(HOUR FROM TIME'26:00:00'); SELECT EXTRACT(HOUR FROM TIME'1 02:00:00'), EXTRACT(HOUR FROM TIME'26:00:00');
SELECT EXTRACT(HOUR FROM TIME('1 02:00:00')), EXTRACT(HOUR FROM TIME('26:00:00')); SELECT EXTRACT(HOUR FROM TIME('1 02:00:00')), EXTRACT(HOUR FROM TIME('26:00:00'));
SELECT EXTRACT(DAY FROM TIME('1 02:00:00')), EXTRACT(DAY FROM TIME('26:00:00')); SELECT EXTRACT(DAY FROM TIME('1 02:00:00')), EXTRACT(DAY FROM TIME('26:00:00'));
SET timestamp=DEFAULT;
--echo # --echo #
--echo # MDEV-5458 RQG hits 'sql/tztime.cc:799: my_time_t sec_since_epoch(int, int, int, int, int, int): Assertion `mon > 0 && mon < 13' failed.' --echo # MDEV-5458 RQG hits 'sql/tztime.cc:799: my_time_t sec_since_epoch(int, int, int, int, int, int): Assertion `mon > 0 && mon < 13' failed.'
@ -1492,6 +1498,7 @@ SELECT CAST(ADDTIME(COALESCE(a,b),0) AS CHAR) FROM t1;
SELECT CAST(ADDTIME(CASE WHEN 0 THEN a ELSE b END,0) AS CHAR) FROM t1; SELECT CAST(ADDTIME(CASE WHEN 0 THEN a ELSE b END,0) AS CHAR) FROM t1;
DROP TABLE t1; DROP TABLE t1;
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
CREATE TABLE t1 (a DATETIME, b TIME); CREATE TABLE t1 (a DATETIME, b TIME);
INSERT INTO t1 VALUES (NULL, '00:20:12'); INSERT INTO t1 VALUES (NULL, '00:20:12');
SELECT IF(1,ADDDATE(IFNULL(a,b),0),1) FROM t1; SELECT IF(1,ADDDATE(IFNULL(a,b),0),1) FROM t1;
@ -1503,3 +1510,4 @@ SELECT CAST(ADDTIME(IFNULL(a,b),0) AS CHAR) FROM t1;
SELECT CAST(ADDTIME(COALESCE(a,b),0) AS CHAR) FROM t1; SELECT CAST(ADDTIME(COALESCE(a,b),0) AS CHAR) FROM t1;
SELECT CAST(ADDTIME(CASE WHEN 0 THEN a ELSE b END,0) AS CHAR) FROM t1; SELECT CAST(ADDTIME(CASE WHEN 0 THEN a ELSE b END,0) AS CHAR) FROM t1;
DROP TABLE t1; DROP TABLE t1;
SET timestamp=DEFAULT;

39
mysql-test/t/old-mode.test
View File

@ -25,3 +25,42 @@ drop table t1,t2;
--replace_result "Writing to net" "NULL" --replace_result "Writing to net" "NULL"
--replace_regex /localhost[:0-9]*/localhost/ --replace_regex /localhost[:0-9]*/localhost/
SHOW PROCESSLIST; SHOW PROCESSLIST;
--echo #
--echo # MDEV-5372 Make "CAST(time_expr AS DATETIME)" compatible with the SQL Standard)
--echo #
# Checking that "mysqld --old" exposes the 5.5 conversion behaviour
SELECT CAST(TIME'-10:30:30' AS DATETIME);
SELECT CAST(TIME'10:20:30' AS DATETIME);
SELECT CAST(TIME'830:20:30' AS DATETIME);
CREATE TABLE t1 (a DATETIME);
INSERT INTO t1 VALUES (TIME'-10:20:30');
INSERT INTO t1 VALUES (TIME'10:20:30');
INSERT INTO t1 VALUES (TIME'830:20:30');
SELECT * FROM t1;
DROP TABLE t1;
CREATE TABLE t1 (a TIMESTAMP);
INSERT INTO t1 VALUES (TIME'-10:20:30');
INSERT INTO t1 VALUES (TIME'10:20:30');
INSERT INTO t1 VALUES (TIME'830:20:30');
SELECT * FROM t1;
DROP TABLE t1;
CREATE TABLE t1 (a TIME);
INSERT INTO t1 VALUES (TIME'-10:20:30');
INSERT INTO t1 VALUES (TIME'10:20:30');
INSERT INTO t1 VALUES (TIME'830:20:30');
SELECT a, CAST(a AS DATETIME), TO_DAYS(a) FROM t1;
DROP TABLE t1;
# Note, it was actually a bug that TO_DAYS('830:20:30') returned NULL
# for a column, while 3 for an expression. We won't fix this,
# it's "mysqld --old" anyway.
SELECT TO_DAYS(TIME'-10:20:30');
SELECT TO_DAYS(TIME'10:20:30');
SELECT TO_DAYS(TIME'830:20:30');
# This is to cover Item_temporal_hybrid_func::fix_temporal_type in --old mode:
CREATE TABLE t1 (a DATETIME, b TIME);
INSERT INTO t1 VALUES (NULL, '00:20:12');
INSERT INTO t1 VALUES (NULL, '-00:20:12');
SELECT IF(1,ADDDATE(IFNULL(a,b),0),1) FROM t1;
DROP TABLE t1;

2
mysql-test/t/temporal_literal.test
View File

@ -195,6 +195,7 @@ DROP TABLE t1;
--echo # --echo #
--echo # TIME literals in no-zero date context --echo # TIME literals in no-zero date context
--echo # --echo #
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
SELECT TO_DAYS(TIME'00:00:00'); SELECT TO_DAYS(TIME'00:00:00');
SELECT TO_SECONDS(TIME'00:00:00'); SELECT TO_SECONDS(TIME'00:00:00');
SELECT DAYOFYEAR(TIME'00:00:00'); SELECT DAYOFYEAR(TIME'00:00:00');
@ -204,6 +205,7 @@ SELECT WEEKDAY(TIME'00:00:00');
SELECT CONVERT_TZ(TIME'00:00:00','+00:00','+01:00'); SELECT CONVERT_TZ(TIME'00:00:00','+00:00','+01:00');
SELECT DATE_ADD(TIME'00:00:00', INTERVAL 1 HOUR); SELECT DATE_ADD(TIME'00:00:00', INTERVAL 1 HOUR);
SELECT TIMESTAMPDIFF(SECOND,TIME'00:00:00', TIME'00:00:00'); SELECT TIMESTAMPDIFF(SECOND,TIME'00:00:00', TIME'00:00:00');
SET timestamp=DEFAULT;
--echo # --echo #
--echo # Testing Item_func::fix_fields() --echo # Testing Item_func::fix_fields()

2
mysql-test/t/timezone2.test
View File

@ -294,8 +294,10 @@ DROP TABLE t1;
--echo # MDEV-4653 Wrong result for CONVERT_TZ(TIME('00:00:00'),'+00:00','+7:5') --echo # MDEV-4653 Wrong result for CONVERT_TZ(TIME('00:00:00'),'+00:00','+7:5')
--echo # --echo #
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
SELECT CONVERT_TZ(TIME('00:00:00'),'+00:00','+7:5'); SELECT CONVERT_TZ(TIME('00:00:00'),'+00:00','+7:5');
SELECT CONVERT_TZ(TIME('2010-01-01 00:00:00'),'+00:00','+7:5'); SELECT CONVERT_TZ(TIME('2010-01-01 00:00:00'),'+00:00','+7:5');
SET timestamp=DEFAULT;
--echo # --echo #
--echo # MDEV-5506 safe_mutex: Trying to lock unitialized mutex at safemalloc.c on server shutdown after SELECT with CONVERT_TZ --echo # MDEV-5506 safe_mutex: Trying to lock unitialized mutex at safemalloc.c on server shutdown after SELECT with CONVERT_TZ

4
mysql-test/t/type_time.test
View File

@ -94,10 +94,12 @@ DROP TABLE t1;
--echo # Bug#53942 valgrind warnings with timestamp() function and incomplete datetime values --echo # Bug#53942 valgrind warnings with timestamp() function and incomplete datetime values
--echo # --echo #
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
CREATE TABLE t1(f1 TIME); CREATE TABLE t1(f1 TIME);
INSERT INTO t1 VALUES ('23:38:57'); INSERT INTO t1 VALUES ('23:38:57');
SELECT TIMESTAMP(f1,'1') FROM t1; SELECT TIMESTAMP(f1,'1') FROM t1;
DROP TABLE t1; DROP TABLE t1;
SET timestamp=DEFAULT;
--echo End of 5.1 tests --echo End of 5.1 tests
@ -126,7 +128,9 @@ drop table t1;
--echo # --echo #
--echo # MDEV-4634 Crash in CONVERT_TZ --echo # MDEV-4634 Crash in CONVERT_TZ
--echo # --echo #
SET timestamp=unix_timestamp('2001-02-03 10:20:30');
SELECT CONVERT_TZ(GREATEST(TIME('00:00:00'),TIME('00:00:00')),'+00:00','+7:5'); SELECT CONVERT_TZ(GREATEST(TIME('00:00:00'),TIME('00:00:00')),'+00:00','+7:5');
SET timestamp=DEFAULT;
--echo # --echo #
--echo # MDEV-4652 Wrong result for CONCAT(GREATEST(TIME('00:00:01'),TIME('00:00:00'))) --echo # MDEV-4652 Wrong result for CONCAT(GREATEST(TIME('00:00:01'),TIME('00:00:00')))

7
sql-common/my_time.c
View File

@ -81,6 +81,8 @@ uint calc_days_in_year(uint year)
my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date, my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date,
ulonglong flags, int *was_cut) ulonglong flags, int *was_cut)
{ {
if (ltime->time_type == MYSQL_TIMESTAMP_TIME)
return FALSE;
if (not_zero_date) if (not_zero_date)
{ {
if (((flags & TIME_NO_ZERO_IN_DATE) && if (((flags & TIME_NO_ZERO_IN_DATE) &&
@ -917,7 +919,8 @@ my_system_gmt_sec(const MYSQL_TIME *t_src, long *my_timezone, uint *error_code)
#endif #endif
tmp= (time_t) (((calc_daynr((uint) t->year, (uint) t->month, (uint) t->day) - tmp= (time_t) (((calc_daynr((uint) t->year, (uint) t->month, (uint) t->day) -
(long) days_at_timestart)*86400L + (long) t->hour*3600L + (long) days_at_timestart) * SECONDS_IN_24H +
(long) t->hour*3600L +
(long) (t->minute*60 + t->second)) + (time_t) my_time_zone - (long) (t->minute*60 + t->second)) + (time_t) my_time_zone -
3600); 3600);
@ -976,7 +979,7 @@ my_system_gmt_sec(const MYSQL_TIME *t_src, long *my_timezone, uint *error_code)
/* shift back, if we were dealing with boundary dates */ /* shift back, if we were dealing with boundary dates */
tmp+= shift*86400L; tmp+= shift * SECONDS_IN_24H;
/* /*
This is possible for dates, which slightly exceed boundaries. This is possible for dates, which slightly exceed boundaries.

33
sql/field.cc
View File

@ -4636,14 +4636,24 @@ int Field_timestamp::store_TIME_with_warning(THD *thd, MYSQL_TIME *l_time,
} }
static bool
copy_or_convert_to_datetime(THD *thd, const MYSQL_TIME *from, MYSQL_TIME *to)
{
if (from->time_type == MYSQL_TIMESTAMP_TIME)
return time_to_datetime(thd, from, to);
*to= *from;
return false;
}
int Field_timestamp::store_time_dec(MYSQL_TIME *ltime, uint dec) int Field_timestamp::store_time_dec(MYSQL_TIME *ltime, uint dec)
{ {
int unused; int unused;
MYSQL_TIME l_time= *ltime;
ErrConvTime str(ltime); ErrConvTime str(ltime);
THD *thd= get_thd(); THD *thd= get_thd();
MYSQL_TIME l_time;
bool valid= !check_date(&l_time, pack_time(&l_time) != 0, bool valid= !copy_or_convert_to_datetime(thd, ltime, &l_time) &&
!check_date(&l_time, pack_time(&l_time) != 0,
(thd->variables.sql_mode & MODE_NO_ZERO_DATE) | (thd->variables.sql_mode & MODE_NO_ZERO_DATE) |
MODE_NO_ZERO_IN_DATE, &unused); MODE_NO_ZERO_IN_DATE, &unused);
@ -5201,15 +5211,28 @@ int Field_temporal_with_date::store(longlong nr, bool unsigned_val)
int Field_temporal_with_date::store_time_dec(MYSQL_TIME *ltime, uint dec) int Field_temporal_with_date::store_time_dec(MYSQL_TIME *ltime, uint dec)
{ {
int error = 0, have_smth_to_conv= 1; int error= 0, have_smth_to_conv= 1;
MYSQL_TIME l_time= *ltime;
ErrConvTime str(ltime); ErrConvTime str(ltime);
MYSQL_TIME l_time;
if (copy_or_convert_to_datetime(get_thd(), ltime, &l_time))
{
/*
Set have_smth_to_conv and error in a way to have
store_TIME_with_warning do bzero().
*/
have_smth_to_conv= false;
error= MYSQL_TIME_WARN_OUT_OF_RANGE;
goto store;
}
/* /*
We don't perform range checking here since values stored in TIME We don't perform range checking here since values stored in TIME
structure always fit into DATETIME range. structure always fit into DATETIME range.
*/ */
have_smth_to_conv= !check_date(&l_time, pack_time(&l_time) != 0, have_smth_to_conv= !check_date(&l_time, pack_time(&l_time) != 0,
sql_mode_for_dates(current_thd), &error); sql_mode_for_dates(current_thd), &error);
store:
return store_TIME_with_warning(&l_time, &str, error, have_smth_to_conv); return store_TIME_with_warning(&l_time, &str, error, have_smth_to_conv);
} }

67
sql/item.cc
View File

@ -234,6 +234,35 @@ bool Item::val_bool()
} }
/**
Get date/time/datetime.
Optionally extend TIME result to DATETIME.
*/
bool Item::get_date_with_conversion(MYSQL_TIME *ltime, ulonglong fuzzydate)
{
/*
Some TIME type items return error when trying to do get_date()
without TIME_TIME_ONLY set (e.g. Item_field for Field_time).
In the SQL standard time->datetime conversion mode we add TIME_TIME_ONLY.
In the legacy time->datetime conversion mode we do not add TIME_TIME_ONLY
and leave it to get_date() to check date.
*/
ulonglong time_flag= (field_type() == MYSQL_TYPE_TIME &&
!current_thd->variables.old_mode) ? TIME_TIME_ONLY : 0;
if (get_date(ltime, fuzzydate | time_flag))
return true;
if (ltime->time_type == MYSQL_TIMESTAMP_TIME &&
!(fuzzydate & TIME_TIME_ONLY))
{
MYSQL_TIME tmp;
if (time_to_datetime_with_warn(current_thd, ltime, &tmp, fuzzydate))
return null_value= true;
*ltime= tmp;
}
return false;
}
/* /*
For the items which don't have its own fast val_str_ascii() For the items which don't have its own fast val_str_ascii()
implementation we provide a generic slower version, implementation we provide a generic slower version,
@ -8779,6 +8808,25 @@ int stored_field_cmp_to_item(THD *thd, Field *field, Item *item)
{ {
Item_result res_type=item_cmp_type(field->result_type(), Item_result res_type=item_cmp_type(field->result_type(),
item->result_type()); item->result_type());
/*
We have to check field->cmp_type() instead of res_type,
as result_type() - and thus res_type - can never be TIME_RESULT (yet).
*/
if (field->cmp_type() == TIME_RESULT)
{
MYSQL_TIME field_time, item_time;
if (field->type() == MYSQL_TYPE_TIME)
{
field->get_time(&field_time);
item->get_time(&item_time);
}
else
{
field->get_date(&field_time, TIME_INVALID_DATES);
item->get_date(&item_time, TIME_INVALID_DATES);
}
return my_time_compare(&field_time, &item_time);
}
if (res_type == STRING_RESULT) if (res_type == STRING_RESULT)
{ {
char item_buff[MAX_FIELD_WIDTH]; char item_buff[MAX_FIELD_WIDTH];
@ -8828,25 +8876,6 @@ int stored_field_cmp_to_item(THD *thd, Field *field, Item *item)
field_val= field->val_decimal(&field_buf); field_val= field->val_decimal(&field_buf);
return my_decimal_cmp(field_val, item_val); return my_decimal_cmp(field_val, item_val);
} }
/*
We have to check field->cmp_type() instead of res_type,
as result_type() - and thus res_type - can never be TIME_RESULT (yet).
*/
if (field->cmp_type() == TIME_RESULT)
{
MYSQL_TIME field_time, item_time;
if (field->type() == MYSQL_TYPE_TIME)
{
field->get_time(&field_time);
item->get_time(&item_time);
}
else
{
field->get_date(&field_time, TIME_INVALID_DATES);
item->get_date(&item_time, TIME_INVALID_DATES);
}
return my_time_compare(&field_time, &item_time);
}
/* /*
The patch for Bug#13463415 started using this function for comparing The patch for Bug#13463415 started using this function for comparing
BIGINTs. That uncovered a bug in Visual Studio 32bit optimized mode. BIGINTs. That uncovered a bug in Visual Studio 32bit optimized mode.

2
sql/item.h
View File

@ -1075,6 +1075,8 @@ public:
virtual bool get_date(MYSQL_TIME *ltime, ulonglong fuzzydate); virtual bool get_date(MYSQL_TIME *ltime, ulonglong fuzzydate);
bool get_time(MYSQL_TIME *ltime) bool get_time(MYSQL_TIME *ltime)
{ return get_date(ltime, TIME_TIME_ONLY | TIME_INVALID_DATES); } { return get_date(ltime, TIME_TIME_ONLY | TIME_INVALID_DATES); }
// Get date with automatic TIME->DATETIME conversion
bool get_date_with_conversion(MYSQL_TIME *ltime, ulonglong fuzzydate);
bool get_seconds(ulonglong *sec, ulong *sec_part); bool get_seconds(ulonglong *sec, ulong *sec_part);
virtual bool get_date_result(MYSQL_TIME *ltime, ulonglong fuzzydate) virtual bool get_date_result(MYSQL_TIME *ltime, ulonglong fuzzydate)
{ return get_date(ltime,fuzzydate); } { return get_date(ltime,fuzzydate); }

2
sql/item_func.h
View File

@ -160,7 +160,7 @@ public:
void count_decimal_length(); void count_decimal_length();
inline bool get_arg0_date(MYSQL_TIME *ltime, ulonglong fuzzy_date) inline bool get_arg0_date(MYSQL_TIME *ltime, ulonglong fuzzy_date)
{ {
return (null_value=args[0]->get_date(ltime, fuzzy_date)); return (null_value=args[0]->get_date_with_conversion(ltime, fuzzy_date));
} }
void count_datetime_length(Item **item, uint nitems); void count_datetime_length(Item **item, uint nitems);
bool count_string_result_length(enum_field_types field_type, bool count_string_result_length(enum_field_types field_type,

82
sql/item_timefunc.cc
View File

@ -1484,27 +1484,52 @@ bool Item_temporal_hybrid_func::fix_temporal_type(MYSQL_TIME *ltime)
{ {
if (ltime->time_type < 0) /* MYSQL_TIMESTAMP_NONE, MYSQL_TIMESTAMP_ERROR */ if (ltime->time_type < 0) /* MYSQL_TIMESTAMP_NONE, MYSQL_TIMESTAMP_ERROR */
return false; return false;
if (ltime->time_type != MYSQL_TIMESTAMP_TIME)
goto date_or_datetime_value;
/* Convert TIME to DATE or DATETIME */
switch (field_type())
{
case MYSQL_TYPE_DATE:
case MYSQL_TYPE_DATETIME:
case MYSQL_TYPE_TIMESTAMP:
{
MYSQL_TIME tmp;
if (time_to_datetime_with_warn(current_thd, ltime, &tmp, 0))
return (null_value= true);
*ltime= tmp;
if (field_type() == MYSQL_TYPE_DATE)
datetime_to_date(ltime);
return false;
}
case MYSQL_TYPE_TIME:
case MYSQL_TYPE_STRING: /* DATE_ADD, ADDTIME can return VARCHAR */
return false;
default:
DBUG_ASSERT(0);
return (null_value= true);
}
date_or_datetime_value:
/* Convert DATE or DATETIME to TIME, DATE, or DATETIME */
switch (field_type()) switch (field_type())
{ {
case MYSQL_TYPE_TIME: case MYSQL_TYPE_TIME:
ltime->year= ltime->month= ltime->day= 0; datetime_to_time(ltime);
ltime->time_type= MYSQL_TIMESTAMP_TIME;
return false; return false;
case MYSQL_TYPE_DATETIME: case MYSQL_TYPE_DATETIME:
case MYSQL_TYPE_TIMESTAMP: case MYSQL_TYPE_TIMESTAMP:
ltime->neg= 0; date_to_datetime(ltime);
ltime->time_type= MYSQL_TIMESTAMP_DATETIME;
return false; return false;
case MYSQL_TYPE_DATE: case MYSQL_TYPE_DATE:
ltime->neg= 0; datetime_to_date(ltime);
ltime->hour= ltime->minute= ltime->second= ltime->second_part= 0;
ltime->time_type= MYSQL_TIMESTAMP_DATE;
return false; return false;
case MYSQL_TYPE_STRING: /* DATE_ADD, ADDTIME can return VARCHAR */ case MYSQL_TYPE_STRING: /* DATE_ADD, ADDTIME can return VARCHAR */
return false; return false;
default: default:
DBUG_ASSERT(0); DBUG_ASSERT(0);
return true; return (null_value= true);
} }
return false; return false;
} }
@ -2190,8 +2215,10 @@ longlong Item_extract::val_int()
long neg; long neg;
int is_time_flag = date_value ? 0 : TIME_TIME_ONLY; int is_time_flag = date_value ? 0 : TIME_TIME_ONLY;
if (get_arg0_date(&ltime, is_time_flag)) // Not using get_arg0_date to avoid automatic TIME to DATETIME conversion
if ((null_value= args[0]->get_date(&ltime, is_time_flag)))
return 0; return 0;
neg= ltime.neg ? -1 : 1; neg= ltime.neg ? -1 : 1;
DBUG_ASSERT(ltime.time_type != MYSQL_TIMESTAMP_TIME || ltime.day == 0); DBUG_ASSERT(ltime.time_type != MYSQL_TIMESTAMP_TIME || ltime.day == 0);
@ -2512,26 +2539,7 @@ bool Item_datetime_typecast::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date)
if (decimals < TIME_SECOND_PART_DIGITS) if (decimals < TIME_SECOND_PART_DIGITS)
my_time_trunc(ltime, decimals); my_time_trunc(ltime, decimals);
/* DBUG_ASSERT(ltime->time_type != MYSQL_TIMESTAMP_TIME);
ltime is valid MYSQL_TYPE_TIME (according to fuzzy_date).
But not every valid TIME value is a valid DATETIME value!
*/
if (ltime->time_type == MYSQL_TIMESTAMP_TIME)
{
if (ltime->neg)
{
ErrConvTime str(ltime);
make_truncated_value_warning(current_thd, Sql_condition::WARN_LEVEL_WARN,
&str, MYSQL_TIMESTAMP_DATETIME, 0);
return (null_value= 1);
}
uint day= ltime->hour/24;
ltime->hour %= 24;
ltime->month= day / 31;
ltime->day= day % 31;
}
ltime->time_type= MYSQL_TIMESTAMP_DATETIME; ltime->time_type= MYSQL_TIMESTAMP_DATETIME;
return 0; return 0;
} }
@ -2665,9 +2673,9 @@ bool Item_func_add_time::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date)
if (!is_time && ltime->neg) if (!is_time && ltime->neg)
return (null_value= 1); return (null_value= 1);
days= (long)(seconds/86400L); days= (long) (seconds / SECONDS_IN_24H);
calc_time_from_sec(ltime, (long)(seconds%86400L), microseconds); calc_time_from_sec(ltime, (long)(seconds % SECONDS_IN_24H), microseconds);
ltime->time_type= is_time ? MYSQL_TIMESTAMP_TIME : MYSQL_TIMESTAMP_DATETIME; ltime->time_type= is_time ? MYSQL_TIMESTAMP_TIME : MYSQL_TIMESTAMP_DATETIME;
@ -2850,8 +2858,12 @@ longlong Item_func_timestamp_diff::val_int()
int neg= 1; int neg= 1;
null_value= 0; null_value= 0;
if (args[0]->get_date(&ltime1, TIME_NO_ZERO_DATE | TIME_NO_ZERO_IN_DATE) || if (args[0]->get_date_with_conversion(&ltime1,
args[1]->get_date(&ltime2, TIME_NO_ZERO_DATE | TIME_NO_ZERO_IN_DATE)) TIME_NO_ZERO_DATE |
TIME_NO_ZERO_IN_DATE) ||
args[1]->get_date_with_conversion(&ltime2,
TIME_NO_ZERO_DATE |
TIME_NO_ZERO_IN_DATE))
goto null_date; goto null_date;
if (calc_time_diff(&ltime2,&ltime1, 1, if (calc_time_diff(&ltime2,&ltime1, 1,
@ -2921,9 +2933,9 @@ longlong Item_func_timestamp_diff::val_int()
case INTERVAL_MONTH: case INTERVAL_MONTH:
return months*neg; return months*neg;
case INTERVAL_WEEK: case INTERVAL_WEEK:
return seconds/86400L/7L*neg; return seconds / SECONDS_IN_24H / 7L * neg;
case INTERVAL_DAY: case INTERVAL_DAY:
return seconds/86400L*neg; return seconds / SECONDS_IN_24H * neg;
case INTERVAL_HOUR: case INTERVAL_HOUR:
return seconds/3600L*neg; return seconds/3600L*neg;
case INTERVAL_MINUTE: case INTERVAL_MINUTE:

2
sql/nt_servc.cc
View File

@ -33,7 +33,7 @@ NTService::NTService()
//time-out variables //time-out variables
nStartTimeOut = 15000; nStartTimeOut = 15000;
nStopTimeOut = 86400000; nStopTimeOut = SECONDS_IN_24H * 1000;
nPauseTimeOut = 5000; nPauseTimeOut = 5000;
nResumeTimeOut = 5000; nResumeTimeOut = 5000;

148
sql/sql_time.cc
View File

@ -1036,8 +1036,8 @@ null_date:
*/ */
bool bool
calc_time_diff(MYSQL_TIME *l_time1, MYSQL_TIME *l_time2, int l_sign, longlong *seconds_out, calc_time_diff(const MYSQL_TIME *l_time1, const MYSQL_TIME *l_time2,
long *microseconds_out) int l_sign, longlong *seconds_out, long *microseconds_out)
{ {
long days; long days;
bool neg; bool neg;
@ -1063,7 +1063,7 @@ calc_time_diff(MYSQL_TIME *l_time1, MYSQL_TIME *l_time2, int l_sign, longlong *s
(uint) l_time2->day); (uint) l_time2->day);
} }
microseconds= ((longlong)days*86400LL + microseconds= ((longlong)days * SECONDS_IN_24H +
(longlong)(l_time1->hour*3600L + (longlong)(l_time1->hour*3600L +
l_time1->minute*60L + l_time1->minute*60L +
l_time1->second) - l_time1->second) -
@ -1133,3 +1133,145 @@ void time_to_daytime_interval(MYSQL_TIME *ltime)
ltime->hour%= 24; ltime->hour%= 24;
ltime->time_type= MYSQL_TIMESTAMP_NONE; ltime->time_type= MYSQL_TIMESTAMP_NONE;
} }
/*** Conversion from TIME to DATETIME ***/
/*
Simple case: TIME is within normal 24 hours internal.
Mix DATE part of ldate and TIME part of ltime together.
*/
static void
mix_date_and_time_simple(MYSQL_TIME *ldate, const MYSQL_TIME *ltime)
{
DBUG_ASSERT(ldate->time_type == MYSQL_TIMESTAMP_DATE ||
ldate->time_type == MYSQL_TIMESTAMP_DATETIME);
ldate->hour= ltime->hour;
ldate->minute= ltime->minute;
ldate->second= ltime->second;
ldate->second_part= ltime->second_part;
ldate->time_type= MYSQL_TIMESTAMP_DATETIME;
}
/*
Complex case: TIME is negative or outside of the 24 hour interval.
*/
static void
mix_date_and_time_complex(MYSQL_TIME *ldate, const MYSQL_TIME *ltime)
{
DBUG_ASSERT(ldate->time_type == MYSQL_TIMESTAMP_DATE ||
ldate->time_type == MYSQL_TIMESTAMP_DATETIME);
longlong seconds;
long days, useconds;
int sign= ltime->neg ? 1 : -1;
ldate->neg= calc_time_diff(ldate, ltime, sign, &seconds, &useconds);
DBUG_ASSERT(!ldate->neg);
DBUG_ASSERT(ldate->year > 0);
days= (long) (seconds / SECONDS_IN_24H);
calc_time_from_sec(ldate, seconds % SECONDS_IN_24H, useconds);
get_date_from_daynr(days, &ldate->year, &ldate->month, &ldate->day);
ldate->time_type= MYSQL_TIMESTAMP_DATETIME;
}
/**
Mix a date value and a time value.
@param IN/OUT ldate Date value.
@param ltime Time value.
*/
static void
mix_date_and_time(MYSQL_TIME *to, const MYSQL_TIME *from)
{
if (!from->neg && from->hour < 24)
mix_date_and_time_simple(to, from);
else
mix_date_and_time_complex(to, from);
}
/**
Get current date in DATE format
*/
static void
set_current_date(THD *thd, MYSQL_TIME *to)
{
thd->variables.time_zone->gmt_sec_to_TIME(to, thd->query_start());
thd->time_zone_used= 1;
datetime_to_date(to);
}
/**
5.5 compatible conversion from TIME to DATETIME
*/
static bool
time_to_datetime_old(THD *thd, const MYSQL_TIME *from, MYSQL_TIME *to)
{
DBUG_ASSERT(from->time_type == MYSQL_TIMESTAMP_TIME);
if (from->neg)
return true;
/* Set the date part */
uint day= from->hour / 24;
to->day= day % 31;
to->month= day / 31;
to->year= 0;
/* Set the time part */
to->hour= from->hour % 24;
to->minute= from->minute;
to->second= from->second;
to->second_part= from->second_part;
/* set sign and type */
to->neg= 0;
to->time_type= MYSQL_TIMESTAMP_DATETIME;
return false;
}
/**
Convert time to datetime.
The time value is added to the current datetime value.
@param IN ltime Time value to convert from.
@param OUT ltime2 Datetime value to convert to.
*/
bool
time_to_datetime(THD *thd, const MYSQL_TIME *from, MYSQL_TIME *to)
{
if (thd->variables.old_mode)
return time_to_datetime_old(thd, from, to);
set_current_date(thd, to);
mix_date_and_time(to, from);
return false;
}
bool
time_to_datetime_with_warn(THD *thd,
const MYSQL_TIME *from, MYSQL_TIME *to,
ulonglong fuzzydate)
{
int warn= 0;
DBUG_ASSERT(from->time_type == MYSQL_TIMESTAMP_TIME);
/*
After time_to_datetime() we need to do check_date(), as
the caller may want TIME_NO_ZERO_DATE or TIME_NO_ZERO_IN_DATE.
Note, the SQL standard time->datetime conversion mode always returns
a valid date based on CURRENT_DATE. So we need to do check_date()
only in the old mode.
*/
if (time_to_datetime(thd, from, to) ||
(thd->variables.old_mode && check_date(to, fuzzydate, &warn)))
{
ErrConvTime str(from);
make_truncated_value_warning(thd, Sql_condition::WARN_LEVEL_WARN,
&str, MYSQL_TIMESTAMP_DATETIME, 0);
return true;
}
return false;
}

31
sql/sql_time.h
View File

@ -49,6 +49,33 @@ bool int_to_datetime_with_warn(longlong value, MYSQL_TIME *ltime,
ulonglong fuzzydate, ulonglong fuzzydate,
const char *name); const char *name);
bool time_to_datetime(THD *thd, const MYSQL_TIME *tm, MYSQL_TIME *dt);
bool time_to_datetime_with_warn(THD *thd,
const MYSQL_TIME *tm, MYSQL_TIME *dt,
ulonglong fuzzydate);
inline void datetime_to_time(MYSQL_TIME *ltime)
{
DBUG_ASSERT(ltime->time_type == MYSQL_TIMESTAMP_DATE ||
ltime->time_type == MYSQL_TIMESTAMP_DATETIME);
DBUG_ASSERT(ltime->neg == 0);
ltime->year= ltime->month= ltime->day= 0;
ltime->time_type= MYSQL_TIMESTAMP_TIME;
}
inline void datetime_to_date(MYSQL_TIME *ltime)
{
DBUG_ASSERT(ltime->time_type == MYSQL_TIMESTAMP_DATE ||
ltime->time_type == MYSQL_TIMESTAMP_DATETIME);
DBUG_ASSERT(ltime->neg == 0);
ltime->hour= ltime->minute= ltime->second= ltime->second_part= 0;
ltime->time_type= MYSQL_TIMESTAMP_DATE;
}
inline void date_to_datetime(MYSQL_TIME *ltime)
{
DBUG_ASSERT(ltime->time_type == MYSQL_TIMESTAMP_DATE ||
ltime->time_type == MYSQL_TIMESTAMP_DATETIME);
DBUG_ASSERT(ltime->neg == 0);
ltime->time_type= MYSQL_TIMESTAMP_DATETIME;
}
void make_truncated_value_warning(THD *thd, void make_truncated_value_warning(THD *thd,
Sql_condition::enum_warning_level level, Sql_condition::enum_warning_level level,
const ErrConv *str_val, const ErrConv *str_val,
@ -76,8 +103,8 @@ bool my_TIME_to_str(const MYSQL_TIME *ltime, String *str, uint dec);
/* MYSQL_TIME operations */ /* MYSQL_TIME operations */
bool date_add_interval(MYSQL_TIME *ltime, interval_type int_type, bool date_add_interval(MYSQL_TIME *ltime, interval_type int_type,
INTERVAL interval); INTERVAL interval);
bool calc_time_diff(MYSQL_TIME *l_time1, MYSQL_TIME *l_time2, int l_sign, bool calc_time_diff(const MYSQL_TIME *l_time1, const MYSQL_TIME *l_time2,
longlong *seconds_out, long *microseconds_out); int l_sign, longlong *seconds_out, long *microseconds_out);
int my_time_compare(const MYSQL_TIME *a, const MYSQL_TIME *b); int my_time_compare(const MYSQL_TIME *a, const MYSQL_TIME *b);
void localtime_to_TIME(MYSQL_TIME *to, struct tm *from); void localtime_to_TIME(MYSQL_TIME *to, struct tm *from);
void calc_time_from_sec(MYSQL_TIME *to, long seconds, long microseconds); void calc_time_from_sec(MYSQL_TIME *to, long seconds, long microseconds);

16
tests/mysql_client_test.c
View File

@ -5976,6 +5976,10 @@ static void test_bind_date_conv(uint row_count)
MYSQL_TIME tm[4]; MYSQL_TIME tm[4];
ulong second_part; ulong second_part;
uint year, month, day, hour, minute, sec; uint year, month, day, hour, minute, sec;
uint now_year= 1990, now_month= 3, now_day= 13;
rc= mysql_query(mysql, "SET timestamp=UNIX_TIMESTAMP('1990-03-13')");
myquery(rc);
stmt= mysql_simple_prepare(mysql, "INSERT INTO test_date VALUES(?, ?, ?, ?)"); stmt= mysql_simple_prepare(mysql, "INSERT INTO test_date VALUES(?, ?, ?, ?)");
check_stmt(stmt); check_stmt(stmt);
@ -6076,9 +6080,15 @@ static void test_bind_date_conv(uint row_count)
i, tm[i].year, tm[i].month, tm[i].day, i, tm[i].year, tm[i].month, tm[i].day,
tm[i].hour, tm[i].minute, tm[i].second, tm[i].hour, tm[i].minute, tm[i].second,
tm[i].second_part); tm[i].second_part);
DIE_UNLESS(tm[i].year == 0 || tm[i].year == year+count); DIE_UNLESS(tm[i].year == 0 || tm[i].year == year + count ||
DIE_UNLESS(tm[i].month == 0 || tm[i].month == month+count); (tm[i].year == now_year &&
DIE_UNLESS(tm[i].day == 0 || tm[i].day == day+count); my_bind[i].buffer_type == MYSQL_TYPE_TIME));
DIE_UNLESS(tm[i].month == 0 || tm[i].month == month + count ||
(tm[i].month == now_month &&
my_bind[i].buffer_type == MYSQL_TYPE_TIME));
DIE_UNLESS(tm[i].day == 0 || tm[i].day == day + count ||
(tm[i].day == now_day &&
my_bind[i].buffer_type == MYSQL_TYPE_TIME));
DIE_UNLESS(tm[i].hour == 0 || tm[i].hour == hour+count); DIE_UNLESS(tm[i].hour == 0 || tm[i].hour == hour+count);
DIE_UNLESS(tm[i].minute == 0 || tm[i].minute == minute+count); DIE_UNLESS(tm[i].minute == 0 || tm[i].minute == minute+count);