summaryrefslogtreecommitdiff
path: root/sql/sql_string.cc
diff options
context:
space:
mode:
authorunknown <bar@bar.intranet.mysql.r18.ru>2003-12-25 17:42:17 +0400
committerunknown <bar@bar.intranet.mysql.r18.ru>2003-12-25 17:42:17 +0400
commit8fac0f4d2753277928a5bb4c2a5fc5a5a8becc64 (patch)
tree6386d5103a8d78819da523843660e04e55656670 /sql/sql_string.cc
parent229cc612776f757de6822eb97eb4e9a97226e760 (diff)
downloadmariadb-git-8fac0f4d2753277928a5bb4c2a5fc5a5a8becc64.tar.gz
Bug 2202: CAST from binary to char still returns a binary string
Diffstat (limited to 'sql/sql_string.cc')
-rw-r--r--sql/sql_string.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index 61070f07266..89f48607969 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -235,7 +235,7 @@ bool String::copy(const char *str, uint32 arg_length,
{
if ((from_cs == &my_charset_bin) || (to_cs == &my_charset_bin))
{
- return copy(str, arg_length, &my_charset_bin);
+ return copy(str, arg_length, to_cs);
}
uint32 new_length= to_cs->mbmaxlen*arg_length;
if (alloc(new_length))