Commit 89924c58 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 

into  polly.local:/home/kaa/src/maint/m41-maint--07OGk


sql/item_timefunc.cc:
  Auto merged
parents 5623f2e9 18b91b02

sql/item_timefunc.cc

+1 −1
Original line number Diff line number Diff line
@@ -1980,7 +1980,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 || int_type == INTERVAL_WEEK )

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

      cached_field_type= arg0_field_type;

    else

      cached_field_type= MYSQL_TYPE_DATETIME;