after-merge fixup.

- have to explicitly set null_value.

after-merge fixup.
- have to explicitly set null_value.
f701fc54 · ramil/ram@mysql.com/myoffice.izhnet.ru · 1bd5c0d5 · f701fc54
Commit f701fc54 authored Nov 16, 2006 by ramil/ram@mysql.com/myoffice.izhnet.ru
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

sql/item_timefunc.cc sql/item_timefunc.cc +4 -0

No files found.
--- 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)