Commit fedfd803 authored by unknown's avatar unknown
Browse files

Merge naruto.:C:/cpp/bug21811/my41-bug21811 

into  naruto.:C:/cpp/mysql-4.1-maint


sql/item_timefunc.cc:
  Auto merged
parents 57efa768 e8cc98c8

sql/item_timefunc.cc

+1 −1
Original line number Diff line number Diff line
@@ -1876,7 +1876,7 @@ void Item_date_add_interval::fix_length_and_dec() 
    cached_field_type= MYSQL_TYPE_DATETIME;

  else if (arg0_field_type == MYSQL_TYPE_DATE)

  {

    if (int_type <= INTERVAL_DAY || int_type == INTERVAL_YEAR_MONTH)

    if (int_type <= INTERVAL_DAY || int_type == INTERVAL_YEAR_MONTH || int_type == INTERVAL_WEEK )

      cached_field_type= arg0_field_type;

    else

      cached_field_type= MYSQL_TYPE_DATETIME;