diff options
| author | unknown <monty@mysql.com> | 2005-02-25 19:51:29 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-02-25 19:51:29 +0200 |
| commit | 0be32e7e5a03be486c49dab46c2630c89a6e99f4 (patch) | |
| tree | e6f827904039e2af38a0130f261728726ef9dc16 /myisam | |
| parent | 3d8aed6d83096102d8273bd238cc186e0fbbf0cb (diff) | |
| parent | 08b3e79e409c79e09751ac8fd684898e390737d3 (diff) | |
| download | mariadb-git-0be32e7e5a03be486c49dab46c2630c89a6e99f4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/sp_pcontext.cc:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_key.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/mi_key.c b/myisam/mi_key.c index 6ac04d562e0..ab5ddd3a378 100644 --- a/myisam/mi_key.c +++ b/myisam/mi_key.c @@ -186,7 +186,7 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key, FIX_LENGTH(cs, pos, length, char_length); memcpy((byte*) key, pos, char_length); if (length > char_length) - cs->cset->fill(cs, key+char_length, length-char_length, ' '); + cs->cset->fill(cs, (char*) key+char_length, length-char_length, ' '); key+= length; } _mi_dpointer(info,key,filepos); @@ -296,7 +296,7 @@ uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old, FIX_LENGTH(cs, pos, length, char_length); memcpy((byte*) key, pos, char_length); if (length > char_length) - cs->cset->fill(cs,key+char_length, length-char_length, ' '); + cs->cset->fill(cs, (char*) key+char_length, length-char_length, ' '); key+= length; k_length-=length; } |