database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

MDEV-17015 Assertion `m_year <= 9999' failed in Year::Year upon bad argument to MAKEDATE

Browse Source
This commit is contained in:
Alexander Barkov
2018-08-18 23:22:22 +04:00
parent bf1c53e9be
commit 4299b82ad8
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/main/type_year.result
View File

@ -554,5 +554,11 @@ MIN(a) MAX(a)
70 69 70 69
DROP TABLE t1; DROP TABLE t1;
# #
# MDEV-17015 Assertion `m_year <= 9999' failed in Year::Year upon bad argument to MAKEDATE
#
SELECT MAKEDATE(18446744073709551615, 1);
MAKEDATE(18446744073709551615, 1)
NULL
#
# End of 10.4 tests # End of 10.4 tests
# #

4
mysql-test/main/type_year.test
View File

@ -294,6 +294,10 @@ SELECT a, CAST(a AS DATE), CAST(COALESCE(a) AS DATE) FROM t1;
SELECT MIN(a), MAX(a) FROM t1; SELECT MIN(a), MAX(a) FROM t1;
DROP TABLE t1; DROP TABLE t1;
--echo #
--echo # MDEV-17015 Assertion `m_year <= 9999' failed in Year::Year upon bad argument to MAKEDATE
--echo #
SELECT MAKEDATE(18446744073709551615, 1);
--echo # --echo #
--echo # End of 10.4 tests --echo # End of 10.4 tests

4
sql/sql_type.cc
View File

@ -323,8 +323,8 @@ VSec6::VSec6(Item *item, const char *type_str, ulonglong limit)
Year::Year(longlong value, bool unsigned_flag, uint length) Year::Year(longlong value, bool unsigned_flag, uint length)
{ {
if ((m_truncated= (value < 0 && !unsigned_flag))) if ((m_truncated= (value < 0))) // Negative or huge unsigned
m_year= 0; m_year= unsigned_flag ? 9999 : 0;
else if (value > 9999) else if (value > 9999)
{ {
m_truncated= true; m_truncated= true;