diff options
| author | unknown <evgen@sunlight.local> | 2007-09-24 17:23:40 +0400 |
|---|---|---|
| committer | unknown <evgen@sunlight.local> | 2007-09-24 17:23:40 +0400 |
| commit | e4cbbcf8a970b854bfbc34f77571afdb0b247814 (patch) | |
| tree | dff8e299e24252baed98de65a5a6435bbbfcf1c4 /sql/item_func.cc | |
| parent | c2c760bdb60eaa22165b518c209381010d489604 (diff) | |
| parent | 17df0d648ca86d7074805228ba50d0f137b486d4 (diff) | |
| download | mariadb-git-e4cbbcf8a970b854bfbc34f77571afdb0b247814.tar.gz | |
Merge sunlight.local:/local_work/27216-bug-5.0-opt-mysql
into sunlight.local:/local_work/merge-5.1-opt-mysql
libmysql/libmysql.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/insert_select.result:
Auto merged
mysql-test/t/insert_select.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/protocol.cc:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/r/type_datetime.result:
Manually merged
mysql-test/t/type_datetime.test:
Manually merged
sql/item_cmpfunc.cc:
Manually merged
sql/item_cmpfunc.h:
Manually merged
sql/sql_insert.cc:
Manually merged
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index efc42c1b73f..6b1c0e340a5 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2238,6 +2238,7 @@ void Item_func_min_max::fix_length_and_dec() else if ((cmp_type == DECIMAL_RESULT) || (cmp_type == INT_RESULT)) max_length= my_decimal_precision_to_length(max_int_part+decimals, decimals, unsigned_flag); + cached_field_type= agg_field_type(args, arg_count); } |