diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2003-08-27 19:15:27 -0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2003-08-27 19:15:27 -0400 |
| commit | f5d4eb89e246337182d6751e66ee1a1f4b2cfff7 (patch) | |
| tree | 19dff2fde41401617e06827c33867e068f9ce734 /sql/item_cmpfunc.cc | |
| parent | 95728904c9587d009e7d803384663c87ed1e79fd (diff) | |
| parent | a73058a77c0fe693ea825ab5f9b896fd7eb1bc2c (diff) | |
| download | mariadb-git-f5d4eb89e246337182d6751e66ee1a1f4b2cfff7.tar.gz | |
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1
sql/field.h:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 642be5491aa..6eb1cb75871 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -687,8 +687,21 @@ Item_func_ifnull::fix_length_and_dec() agg_arg_collations(collation, args, arg_count); else if (cached_result_type != REAL_RESULT) decimals= 0; + + cached_field_type= args[0]->field_type(); + if (cached_field_type != args[1]->field_type()) + cached_field_type= Item_func::field_type(); +} + +enum_field_types Item_func_ifnull::field_type() const +{ + return cached_field_type; } +Field *Item_func_ifnull::tmp_table_field(TABLE *table) +{ + return tmp_table_field_from_field_type(table); +} double Item_func_ifnull::val() |