diff options
Diffstat (limited to 'mysys/hash.c')
| -rw-r--r-- | mysys/hash.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/hash.c b/mysys/hash.c index 665e3d11e8d..4ef8847363f 100644 --- a/mysys/hash.c +++ b/mysys/hash.c @@ -41,7 +41,7 @@ static int hashcmp(HASH *hash,HASH_LINK *pos,const byte *key,uint length); static uint calc_hash(HASH *hash,const byte *key,uint length) { ulong nr1=1, nr2=4; - hash->charset->coll->hash_sort(hash->charset,key,length,&nr1,&nr2); + hash->charset->coll->hash_sort(hash->charset,(uchar*) key,length,&nr1,&nr2); return nr1; } @@ -216,7 +216,8 @@ static int hashcmp(HASH *hash,HASH_LINK *pos,const byte *key,uint length) uint rec_keylength; byte *rec_key= (byte*) hash_key(hash,pos->data,&rec_keylength,1); return (length && length != rec_keylength) || - my_strnncoll(hash->charset, rec_key, rec_keylength, key, length); + my_strnncoll(hash->charset, (uchar*) rec_key, rec_keylength, + (uchar*) key, length); } |