summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
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.cc
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.cc')
-rw-r--r--sql/item_func.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index ca8b0af865d..580d19fbd4e 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -4208,7 +4208,7 @@ my_decimal *Item_func_set_user_var::val_decimal(my_decimal *val)
}
-double Item_func_set_user_var::val_real_result()
+double Item_func_set_user_var::val_result()
{
DBUG_ASSERT(fixed == 1);
check(TRUE);
@@ -4224,7 +4224,7 @@ longlong Item_func_set_user_var::val_int_result()
return entry->val_int(&null_value);
}
-String *Item_func_set_user_var::val_str_result(String *str)
+String *Item_func_set_user_var::str_result(String *str)
{
DBUG_ASSERT(fixed == 1);
check(TRUE);