Commit 902ce6fc authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/ram/work/mysql-5.0-maint 

into  mysql.com:/usr/home/ram/work/mysql-5.1-maint


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 153421fb 8639c18f

sql/item_timefunc.cc

+4 −0
Original line number Diff line number Diff line
@@ -3246,7 +3246,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)