1 files changed, 4 insertions, 6 deletions

diff --git a/sql/item_func.h b/sql/item_func.h
index cb0b7dc02a4..76d1151f3bf 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -262,12 +262,8 @@ public:
     null_value= args[0]->null_value;
     return tmp;
   }
-  longlong val_int()
-  {
-    longlong tmp= args[0]->val_int();
-    null_value= args[0]->null_value; 
-    return tmp;
-  }
+  longlong val_int();
+  longlong val_int_from_str(int *error);
   void fix_length_and_dec()
   { max_length=args[0]->max_length; unsigned_flag=0; }
   void print(String *str);
@@ -281,6 +277,7 @@ public:
   const char *func_name() const { return "cast_as_unsigned"; }
   void fix_length_and_dec()
   { max_length=args[0]->max_length; unsigned_flag=1; }
+  longlong val_int();
   void print(String *str);
 };
 
@@ -1071,6 +1068,7 @@ class Item_func_set_user_var :public Item_func
   char buffer[MAX_FIELD_WIDTH];
   String value;
   my_decimal decimal_buff;
+  bool null_item;
   union
   {
     longlong vint;