summaryrefslogtreecommitdiff
path: root/sql/item_sum.cc
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-12-20 12:51:57 +0200
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-12-20 12:51:57 +0200
commit042f763268c0f209e7c12e0a6a72bb5d204dfe29 (patch)
tree7ee15ab50af97cab4135f3712f95ac12fafc74c5 /sql/item_sum.cc
parentcb121a047b55403fe271570c928fd95ed64a1c8f (diff)
parent924db8b4ed3f268cbe91a1734611f4dc2311c7be (diff)
downloadmariadb-git-042f763268c0f209e7c12e0a6a72bb5d204dfe29.tar.gz
Merge remote-tracking branch '5.5' into 10.0
Diffstat (limited to 'sql/item_sum.cc')
-rw-r--r--sql/item_sum.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 0f10d832ba6..7b017cd810a 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -3670,7 +3670,7 @@ void Item_func_group_concat::print(String *str, enum_query_type query_type)
}
}
str->append(STRING_WITH_LEN(" separator \'"));
- str->append(*separator);
+ str->append_for_single_quote(separator->ptr(), separator->length());
str->append(STRING_WITH_LEN("\')"));
}