diff options
author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-11-16 18:09:34 +0400 |
---|---|---|
committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-11-16 18:09:34 +0400 |
commit | 8639c18f4dd9501357bc1db7b0fae5de5101c8e3 (patch) | |
tree | 3fc2342b2c54e4ee279ea08fed2b446c67b0a362 /sql/item_timefunc.cc | |
parent | 3ea5628b110080fb5a365f6af9d7c36be835a159 (diff) | |
download | mariadb-git-8639c18f4dd9501357bc1db7b0fae5de5101c8e3.tar.gz |
after-merge fixup.
- have to explicitly set null_value.
Diffstat (limited to 'sql/item_timefunc.cc')
-rw-r--r-- | sql/item_timefunc.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index db526050bfd..0bba00cbeec 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -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) || (ltime->month == 0)) + { + null_value= 1; return 1; + } + null_value= 0; uint month_idx= ltime->month-1; ltime->day= days_in_month[month_idx]; if ( month_idx == 1 && calc_days_in_year(ltime->year) == 366) |