summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2017-11-15 15:52:03 +0400
committerAlexander Barkov <bar@mariadb.org>2017-11-15 15:52:03 +0400
commit02e35ef5f237b03c3e735fa7afe21dd92086cbc5 (patch)
treed3a54264d73f27c00581a5ff4169fcf3bca537bd /sql/item_strfunc.cc
parentea1739f90d07c9f252b63a19cd9425b05abaf33a (diff)
downloadmariadb-git-02e35ef5f237b03c3e735fa7afe21dd92086cbc5.tar.gz
MDEV-12681 Wrong VIEW results for CHAR(0xDF USING latin1)
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r--sql/item_strfunc.cc14
1 files changed, 14 insertions, 0 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index c1bca3e12eb..3ee8a0e4970 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2905,6 +2905,20 @@ String *Item_func_make_set::val_str(String *str)
}
+void Item_func_char::print(String *str, enum_query_type query_type)
+{
+ str->append(Item_func_char::func_name());
+ str->append('(');
+ print_args(str, 0, query_type);
+ if (collation.collation != &my_charset_bin)
+ {
+ str->append(C_STRING_WITH_LEN(" using "));
+ str->append(collation.collation->csname);
+ }
+ str->append(')');
+}
+
+
String *Item_func_char::val_str(String *str)
{
DBUG_ASSERT(fixed == 1);