summaryrefslogtreecommitdiff
path: root/mysys/my_safehash.c
diff options
context:
space:
mode:
authorunknown <monty@mysql.com/narttu.mysql.fi>2007-08-22 10:56:10 +0300
committerunknown <monty@mysql.com/narttu.mysql.fi>2007-08-22 10:56:10 +0300
commitd430e5bfc1327de723911aa22f26eb83b46c6592 (patch)
tree6be3637d52e87e26e71bcd7424457a2d935a2085 /mysys/my_safehash.c
parenta1f80c1e70d9c5d55915ced453675269067f7517 (diff)
downloadmariadb-git-d430e5bfc1327de723911aa22f26eb83b46c6592.tar.gz
Fixed compiler warnings
Fixed wrong hash function prototype (causes failure on 64 bit systems) mysql-test/r/rpl_events.result: Removed wrong merge (result file is now identical as in 5.1 tree) mysys/lf_hash.c: Fixed compiler warning mysys/my_safehash.c: Fixed wrong hash function prototype (causes failure on 64 bit systems) storage/maria/unittest/ma_test_loghandler_max_lsn-t.c: Fixed compiler warning
Diffstat (limited to 'mysys/my_safehash.c')
-rw-r--r--mysys/my_safehash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_safehash.c b/mysys/my_safehash.c
index b34ad5f16ff..b3d6439793c 100644
--- a/mysys/my_safehash.c
+++ b/mysys/my_safehash.c
@@ -70,7 +70,7 @@ static void safe_hash_entry_free(SAFE_HASH_ENTRY *entry)
# reference on the key
*/
-static uchar *safe_hash_entry_get(SAFE_HASH_ENTRY *entry, uint *length,
+static uchar *safe_hash_entry_get(SAFE_HASH_ENTRY *entry, size_t *length,
my_bool not_used __attribute__((unused)))
{
*length= entry->length;