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

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

Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into polly.local:/home/kaa/src/maint/m41-maint--07OGk
0561e65a · kaa@polly.local · 737e13e5 · b62f0c7b · 0561e65a
Commit 0561e65a authored Oct 11, 2006 by kaa@polly.local
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/item_timefunc.cc sql/item_timefunc.cc +1 -1

No files found.
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -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;