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;
 }