diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-14 16:42:43 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-14 16:42:43 +0500 |
| commit | 0662a9b78a201a0343004bc3066f8587f49f4e6c (patch) | |
| tree | 970f3c802c31f6740056dc4d047fed4ec26d9ab9 /sql/field.cc | |
| parent | 73016f8f90edecb433e7ebbf09f0b261c19dce84 (diff) | |
| parent | 167751b3f08295f9cdf752d48af196698867eca3 (diff) | |
| download | mariadb-git-0662a9b78a201a0343004bc3066f8587f49f4e6c.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
client/mysqltest.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/include/mix1.inc:
merging
mysql-test/r/innodb_mysql.result:
merging
sql/sql_select.cc:
merging
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 82fe63ea78a..e6713e548ab 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -6395,7 +6395,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; } |