diff options
| author | unknown <Kristofer.Pettersson@naruto.> | 2006-10-11 13:42:48 +0200 |
|---|---|---|
| committer | unknown <Kristofer.Pettersson@naruto.> | 2006-10-11 13:42:48 +0200 |
| commit | 18b91b023d5145cc900a503b168414abd11f3650 (patch) | |
| tree | db7cf0ca7ddf7df05b50412453e42a0aad6919f9 /sql/item_timefunc.cc | |
| parent | fedfd803ef5377ee047b4334b2b1f75fc5763b6d (diff) | |
| download | mariadb-git-18b91b023d5145cc900a503b168414abd11f3650.tar.gz | |
Cset exclude: Kristofer.Pettersson@naruto.|ChangeSet|20060922092201|15946
sql/item_timefunc.cc:
Exclude
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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; |