diff options
author | Venkatesh Duggirala <venkatesh.duggirala@oracle.com> | 2013-01-28 14:58:55 +0530 |
---|---|---|
committer | Venkatesh Duggirala <venkatesh.duggirala@oracle.com> | 2013-01-28 14:58:55 +0530 |
commit | 3c5326f8cc45ccecb12a03440e6a9647b07e8d34 (patch) | |
tree | 3fbbd18780aa228d55458219e5a948b5a66f0c69 /sql/item_func.cc | |
parent | 08a22ba1c9b0513d9a32509bbfe5b49261ee7676 (diff) | |
parent | 7e0901b97fa087e4458f32ffd165103f31a1fef8 (diff) | |
download | mariadb-git-3c5326f8cc45ccecb12a03440e6a9647b07e8d34.tar.gz |
Bug#16084594 USER_VAR ITEM IN 'LOAD FILE QUERY' WAS NOT
PROPERLY QUOTED IN BINLOG FILE
Merging fix from mysql-5.1
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r-- | sql/item_func.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 39d19fab421..e4f655ea6ba 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -5175,7 +5175,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(')'); } @@ -5274,7 +5274,7 @@ 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) { str->append('@'); - str->append(name.str,name.length); + append_identifier(current_thd, str, name.str, name.length); } |