summaryrefslogtreecommitdiff
path: root/sql/field_conv.cc
diff options
context:
space:
mode:
authorbar@mysql.com <>2004-08-19 11:59:33 +0500
committerbar@mysql.com <>2004-08-19 11:59:33 +0500
commit7f92905954b94ac17d0775f2e06b04f7db0cc949 (patch)
tree9747318c80887ffa3c93f999b16dee054c87c437 /sql/field_conv.cc
parent3f75d2bd3eff347f105e1eea11c7395376e6d005 (diff)
downloadmariadb-git-7f92905954b94ac17d0775f2e06b04f7db0cc949.tar.gz
Bug#5081: UCS2 fields are filled with '0x2020' after extending field length
Diffstat (limited to 'sql/field_conv.cc')
-rw-r--r--sql/field_conv.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc
index e98068ef974..d7993939092 100644
--- a/sql/field_conv.cc
+++ b/sql/field_conv.cc
@@ -340,8 +340,10 @@ static void do_cut_string(Copy_field *copy)
static void do_expand_string(Copy_field *copy)
{
+ CHARSET_INFO *cs= copy->from_field->charset();
memcpy(copy->to_ptr,copy->from_ptr,copy->from_length);
- bfill(copy->to_ptr+copy->from_length,copy->to_length-copy->from_length,' ');
+ cs->cset->fill(cs, copy->to_ptr+copy->from_length,
+ copy->to_length-copy->from_length, ' ');
}
static void do_varstring(Copy_field *copy)