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

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

Merge naruto.:C:/cpp/bug21811/my41-bug21811
into naruto.:C:/cpp/mysql-4.1-maint
79f1355b · Kristofer.Pettersson@naruto · 0ab343a7 · 2f33711f · 79f1355b
Commit 79f1355b authored Oct 11, 2006 by Kristofer.Pettersson@naruto
Show 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
@@ -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;