diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-10-29 18:45:19 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-10-29 18:45:19 +0200 |
| commit | 2ee9343c873ad31c2dd0d2175dec2ef3b48ca5ba (patch) | |
| tree | aa51c10a594658b3668ff850c8fa7ece175a2692 /sql/sql_time.cc | |
| parent | 8b92c642981e7b226e0d93b958cc470bb1e6fad0 (diff) | |
| parent | 893ebb739e24637985892da1555f2e6f1a8ac5b6 (diff) | |
| download | mariadb-git-mariadb-galera-5.5.62.tar.gz | |
Merge tag 'mariadb-5.5.62' into 5.5-galeramariadb-galera-5.5.62
Diffstat (limited to 'sql/sql_time.cc')
| -rw-r--r-- | sql/sql_time.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_time.cc b/sql/sql_time.cc index d912a7b78d6..33bb9a460b0 100644 --- a/sql/sql_time.cc +++ b/sql/sql_time.cc @@ -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; |