Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base

into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge

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