diff options
| author | malff/marcsql@weblab.(none) <> | 2007-06-15 11:36:31 -0600 |
|---|---|---|
| committer | malff/marcsql@weblab.(none) <> | 2007-06-15 11:36:31 -0600 |
| commit | 7e36d37eb0bfa38147ef5699fb933884b61efd11 (patch) | |
| tree | e69d0f413364d2123ae31e0f8e09637140cf95ef /sql/field.cc | |
| parent | 9e6685dc74180ebbe7344a5403c498f1f9a22153 (diff) | |
| parent | e6a478dee6a36f515d24b0ed6c30f8dc1d30c6ae (diff) | |
| download | mariadb-git-7e36d37eb0bfa38147ef5699fb933884b61efd11.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
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 3e4d27b2e38..242d1351bbd 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -6396,7 +6396,8 @@ uint Field_string::get_key_image(uchar *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, (char*) buff + bytes, + length - bytes, field_charset->pad_char); return bytes; } |