From 18b91b023d5145cc900a503b168414abd11f3650 Mon Sep 17 00:00:00 2001
From: unknown <Kristofer.Pettersson@naruto.>
Date: Wed, 11 Oct 2006 13:42:48 +0200
Subject: Cset exclude:
 Kristofer.Pettersson@naruto.|ChangeSet|20060922092201|15946

sql/item_timefunc.cc:
  Exclude
---
 sql/item_timefunc.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/item_timefunc.cc')

diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 0b65fdafe31..02c8ab19354 100644
--- 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 || 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;
-- 
cgit v1.2.1