summaryrefslogtreecommitdiff
path: root/sql/item_func.h
diff options
context:
space:
mode:
authorunknown <evgen@moonbone.local>2007-06-03 15:56:48 +0400
committerunknown <evgen@moonbone.local>2007-06-03 15:56:48 +0400
commite19dcfa91f63a7ff310a11a00ac670a04dfdd1fb (patch)
treea4d8e6036aa00a7e21294b1c8c9b9cd7a95030f3 /sql/item_func.h
parent4ef028600a3a0f13ef29a8b356e9ce5883080a84 (diff)
downloadmariadb-git-e19dcfa91f63a7ff310a11a00ac670a04dfdd1fb.tar.gz
user_var.result:
Corrected test case result for the bug#28494. item_func.h, item_func.cc: Corrected function names after fix for the bug#28494. mysql-test/r/user_var.result: Corrected test case result for the bug#28494. sql/item_func.h: Corrected function names after fix for the bug#28494. sql/item_func.cc: Corrected function names after fix for the bug#28494.
Diffstat (limited to 'sql/item_func.h')
-rw-r--r--sql/item_func.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.h b/sql/item_func.h
index c8ea79b9747..9a0201cb28b 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1208,9 +1208,9 @@ public:
longlong val_int();
String *val_str(String *str);
my_decimal *val_decimal(my_decimal *);
- double val_real_result();
+ double val_result();
longlong val_int_result();
- String *val_str_result(String *str);
+ String *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);