summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-02-28 22:47:29 +0100
committerSergei Golubchik <sergii@pisem.net>2013-02-28 22:47:29 +0100
commit213f1c76a038ad0e6111cd5eb6b0da9b4b9dc45a (patch)
tree79e9a941a078d73ce85da0241871a863fa4eca38 /sql/item_func.cc
parentcfa94b4338b5dd5578436df0402b2f2210de3eaa (diff)
parentc4341d50950224bb4e976fd1aac23dddc7d78f71 (diff)
downloadmariadb-git-213f1c76a038ad0e6111cd5eb6b0da9b4b9dc45a.tar.gz
5.3->5.5 merge
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 7f309c7a4d3..6cfb3a9608d 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -4784,7 +4784,7 @@ void Item_func_set_user_var::save_item_result(Item *item)
{
DBUG_ENTER("Item_func_set_user_var::save_item_result");
- switch (cached_result_type) {
+ switch (args[0]->result_type()) {
case REAL_RESULT:
save_result.vreal= item->val_result();
break;