database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

item_cmpfunc.cc, field.cc, sql_insert.cc, sql_class.h, sql_yacc.yy:

Browse Source 
Post merge fix.
This commit is contained in:
evgen@moonbone.local
2007-06-11 13:38:37 +04:00
parent a52c981d6a
commit dcc1d8229b
5 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/field.cc
View File

@@ -6426,8 +6426,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)
field_charset->cset->fill(field_charset, buff + bytes, length - bytes,
field_charset->pad_char);
field_charset->cset->fill(field_charset, (char*) buff + bytes,
length - bytes, field_charset->pad_char);
return bytes;
}