diff options
| author | unknown <joreland@mysql.com> | 2004-08-19 10:37:47 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-08-19 10:37:47 +0200 |
| commit | b368cb3f6e57f7cba609088ca3ff2376bbe1b56a (patch) | |
| tree | 4a02cfc818f5b160557187bee066fa1f8be37473 /sql | |
| parent | 853a01f7195a1a65af9cdcc8f555a8f319cbf795 (diff) | |
| parent | 0e0b785fc31dfaaaaf4d4d95d58758680bb54bdd (diff) | |
| download | mariadb-git-b368cb3f6e57f7cba609088ca3ff2376bbe1b56a.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/field_conv.cc | 4 |
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) |