Skip to content

M
mariadb
Commit f701fc54 authored by ramil/ram@mysql.com/myoffice.izhnet.ru's avatar ramil/ram@mysql.com/myoffice.izhnet.ru
Browse files
Options

after-merge fixup. 

  - have to explicitly set null_value.
parent 1bd5c0d5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
sql/item_timefunc.cc
View file @ f701fc54
...@@ -3371,7 +3371,11 @@ bool Item_func_last_day::get_date(TIME *ltime, uint fuzzy_date) ...@@ -3371,7 +3371,11 @@ bool Item_func_last_day::get_date(TIME *ltime, uint fuzzy_date)
{ {
if (get_arg0_date(ltime, fuzzy_date & ~TIME_FUZZY_DATE) || if (get_arg0_date(ltime, fuzzy_date & ~TIME_FUZZY_DATE) ||
(ltime->month == 0)) (ltime->month == 0))
{
null_value= 1;
return 1; return 1;
}
null_value= 0;
uint month_idx= ltime->month-1; uint month_idx= ltime->month-1;
ltime->day= days_in_month[month_idx]; ltime->day= days_in_month[month_idx];
if ( month_idx == 1 && calc_days_in_year(ltime->year) == 366) if ( month_idx == 1 && calc_days_in_year(ltime->year) == 366)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7