Commit 3f732256 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  mysql.com:/usr/home/ram/work/4.1.b18501


sql/item_timefunc.cc:
  Auto merged
parents 1bdb7f77 3ca1852c

mysql-test/r/func_time.result

+4 −0
Original line number Diff line number Diff line
@@ -626,3 +626,7 @@ last_day('2005-01-00') 
NULL

Warnings:

Warning	1292	Truncated incorrect datetime value: '2005-01-00'

select monthname(str_to_date(null, '%m')), monthname(str_to_date(null, '%m')),

monthname(str_to_date(1, '%m')), monthname(str_to_date(0, '%m'));

monthname(str_to_date(null, '%m'))	monthname(str_to_date(null, '%m'))	monthname(str_to_date(1, '%m'))	monthname(str_to_date(0, '%m'))

NULL	NULL	January	NULL

mysql-test/t/func_time.test

+7 −0
Original line number Diff line number Diff line
@@ -315,4 +315,11 @@ select last_day('2005-00-00'); 
select last_day('2005-00-01');

select last_day('2005-01-00');



#

# Bug #18501: monthname and NULLs

#



select monthname(str_to_date(null, '%m')), monthname(str_to_date(null, '%m')),

       monthname(str_to_date(1, '%m')), monthname(str_to_date(0, '%m'));



# End of 4.1 tests

sql/item_timefunc.cc

+2 −2
Original line number Diff line number Diff line
@@ -906,9 +906,9 @@ String* Item_func_monthname::val_str(String* str) 
{

  DBUG_ASSERT(fixed == 1);

  const char *month_name;

  uint   month=(uint) Item_func_month::val_int();

  uint   month= (uint) val_int();



  if (!month)					// This is also true for NULL

  if (null_value || !month)

  {

    null_value=1;

    return (String*) 0;