diff options
| author | unknown <kaa@polly.local> | 2006-10-11 17:19:19 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-10-11 17:19:19 +0400 |
| commit | 89924c5874f227ae40fb3300e3da3a50cca2f1d8 (patch) | |
| tree | f5f42e3d0292d31cbcc752426d6c2865d8262570 /sql | |
| parent | 5623f2e9a617accb5d7682461a866bc32a1ca0e9 (diff) | |
| parent | 18b91b023d5145cc900a503b168414abd11f3650 (diff) | |
| download | mariadb-git-89924c5874f227ae40fb3300e3da3a50cca2f1d8.tar.gz | |
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
Diffstat (limited to 'sql')
| -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 bac31033191..c1bca7afc60 100644 --- 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; |