diff options
author | unknown <jani@linux-th5m.site> | 2007-05-24 19:47:58 +0300 |
---|---|---|
committer | unknown <jani@linux-th5m.site> | 2007-05-24 19:47:58 +0300 |
commit | 635728a6e69f95c0a4008fb4b65992d58486bc51 (patch) | |
tree | 2958d280359513f6d2b3ce1f9b1dfd0f818bfb98 /mysys/hash.c | |
parent | 6356f5631c1b6dab40b747abe54797f1779aef80 (diff) | |
download | mariadb-git-635728a6e69f95c0a4008fb4b65992d58486bc51.tar.gz |
Merged from main 5.1
Diffstat (limited to 'mysys/hash.c')
-rw-r--r-- | mysys/hash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/hash.c b/mysys/hash.c index b4f9ba96b09..698c2299f4d 100644 --- a/mysys/hash.c +++ b/mysys/hash.c @@ -317,7 +317,7 @@ my_bool my_hash_insert(HASH *info,const uchar *record) if (HASH_UNIQUE & info->flags) { - byte *key= (byte*) hash_key(info, record, &idx, 1); + char *key= (char*) hash_key(info, record, &idx, 1); if (hash_search(info, key, idx)) return(TRUE); /* Duplicate entry */ } @@ -542,7 +542,7 @@ my_bool hash_update(HASH *hash, uchar *record, uchar *old_key, if (HASH_UNIQUE & hash->flags) { HASH_SEARCH_STATE state; - byte *found, *new_key= hash_key(hash, record, &idx, 1); + char *found, *new_key= hash_key(hash, record, &idx, 1); if ((found= hash_first(hash, new_key, idx, &state))) do { |