summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2018-10-14 17:28:55 +0400
committerAlexander Barkov <bar@mariadb.com>2018-10-14 17:28:55 +0400
commita53b99bf1333722b8f30fdbba7d7a40ce2485976 (patch)
treef831ec30f6feb9a08211b213c89c64542776dbe2 /sql-common
parentbe31c18e4a65d58892d43b616f3db54c86c0f94f (diff)
downloadmariadb-git-a53b99bf1333722b8f30fdbba7d7a40ce2485976.tar.gz
MDEV-17417 TIME(99991231235959) returns 838:59:59 instead of 23:59:58
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/my_time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c
index c2e5aeee44b..ce6e4846fad 100644
--- a/sql-common/my_time.c
+++ b/sql-common/my_time.c
@@ -1444,7 +1444,7 @@ longlong number_to_datetime(longlong nr, ulong sec_part, MYSQL_TIME *time_res,
int number_to_time(my_bool neg, ulonglong nr, ulong sec_part,
MYSQL_TIME *ltime, int *was_cut)
{
- if (nr > 9999999 && nr < 99991231235959ULL && neg == 0)
+ if (nr > 9999999 && nr <= 99991231235959ULL && neg == 0)
return number_to_datetime(nr, sec_part, ltime,
C_TIME_INVALID_DATES, was_cut) < 0 ? -1 : 0;