Commit 0561e65a authored by kaa@polly.local's avatar kaa@polly.local

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

into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
parents 737e13e5 b62f0c7b
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment