fixed bug #910 (right type of ifnull function)

1 files changed, 4 insertions, 0 deletions

diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index 25cc97d60bf..5dd919c984b 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -281,6 +281,8 @@ public:
 class Item_func_ifnull :public Item_func
 {
   enum Item_result cached_result_type;
+  enum_field_types cached_field_type;
+  bool field_type_defined;
 public:
   Item_func_ifnull(Item *a,Item *b)
     :Item_func(a,b), cached_result_type(INT_RESULT)
@@ -289,8 +291,10 @@ public:
   longlong val_int();
   String *val_str(String *str);
   enum Item_result result_type () const { return cached_result_type; }
+  enum_field_types field_type() const;
   void fix_length_and_dec();
   const char *func_name() const { return "ifnull"; }
+  Field *tmp_table_field(TABLE *table);
 };