Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql

into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql

1 files changed, 4 insertions, 0 deletions

diff --git a/sql/item_func.h b/sql/item_func.h
index 8c761f605db..213e4298b39 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1236,6 +1236,10 @@ public:
   longlong val_int();
   String *val_str(String *str);
   my_decimal *val_decimal(my_decimal *);
+  double val_real_result();
+  longlong val_int_result();
+  String *val_str_result(String *str);
+  my_decimal *val_decimal_result(my_decimal *);
   bool update_hash(void *ptr, uint length, enum Item_result type,
   		   CHARSET_INFO *cs, Derivation dv, bool unsigned_arg);
   bool send(Protocol *protocol, String *str_arg);