diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-06-15 08:56:40 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-06-15 08:56:40 -0600 |
| commit | f67e46d374fd7e57dd2dba3d8616691f64587385 (patch) | |
| tree | a50c29f5e92b1878275dde6e2de536f4a931fb41 /sql/field.cc | |
| parent | 5afdd974c8fe3fc2b1031e9cb56ce134a9c1cdbe (diff) | |
| parent | bcd6183fe7f242648ce6e04c8224c98531f1cbff (diff) | |
| download | mariadb-git-f67e46d374fd7e57dd2dba3d8616691f64587385.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
sql/field.cc:
Auto merged
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index f801ace5390..f81b1c33fa7 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -6219,7 +6219,8 @@ uint Field_string::get_key_image(char *buff, uint length, imagetype type_arg) length / field_charset->mbmaxlen); memcpy(buff, ptr, bytes); if (bytes < length) - bzero(buff + bytes, length - bytes); + field_charset->cset->fill(field_charset, buff + bytes, length - bytes, + field_charset->pad_char); return bytes; } |