summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2012-08-24 12:32:46 +0200
committerunknown <knielsen@knielsen-hq.org>2012-08-24 12:32:46 +0200
commit96703a63da2211cefcc480fa4f135acd94743622 (patch)
treea95df690fd2ca5cf82947213f2da5ad653fc26c1 /sql/item_func.cc
parent60561ae6133cf40f4fc445e1d6e8f395a20b2573 (diff)
parentcdeabcfd436c65e0a97e74b1722d0259ba907541 (diff)
downloadmariadb-git-96703a63da2211cefcc480fa4f135acd94743622.tar.gz
Merge from 5.1.
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 8028ae53eaf..7d584ce60aa 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -4784,7 +4784,7 @@ enum Item_result Item_func_get_user_var::result_type() const
void Item_func_get_user_var::print(String *str, enum_query_type query_type)
{
str->append(STRING_WITH_LEN("(@"));
- str->append(name.str,name.length);
+ append_identifier(current_thd, str, name.str, name.length);
str->append(')');
}
@@ -4882,10 +4882,10 @@ my_decimal* Item_user_var_as_out_param::val_decimal(my_decimal *decimal_buffer)
}
-void Item_user_var_as_out_param::print(String *str, enum_query_type query_type)
+void Item_user_var_as_out_param::print_for_load(THD *thd, String *str)
{
str->append('@');
- str->append(name.str,name.length);
+ append_identifier(thd, str, name.str, name.length);
}