database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '5.5' into 10.0

Browse Source
This commit is contained in:
Oleksandr Byelkin
2018-08-15 16:48:13 +02:00
parent b62ac16185 1b797e9e63
commit bcc677bb72
19 changed files with 122 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_time.cc
View File

@ -190,7 +190,7 @@ bool get_date_from_daynr(long daynr,uint *ret_year,uint *ret_month,
ulong convert_period_to_month(ulong period)
{
ulong a,b;
if (period == 0)
if (period == 0 || period > 999912)
return 0L;
if ((a=period/100) < YY_PART_YEAR)
a+=2000;