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

1 files changed, 4 insertions, 4 deletions

diff --git a/mysys/lf_hash.c b/mysys/lf_hash.c
index 3f6b9082ab9..322f04cdc41 100644
--- a/mysys/lf_hash.c
+++ b/mysys/lf_hash.c
@@ -32,10 +32,10 @@ LF_REQUIRE_PINS(3);
 
 /* An element of the list */
 typedef struct {
-  intptr volatile link; /* a pointer to the next element in a listand a flag  */
-  uint32 hashnr;        /* reversed hash number, for sorting                  */
+  intptr volatile link; /* a pointer to the next element in a listand a flag */
+  uint32 hashnr;        /* reversed hash number, for sorting                 */
   const uchar *key;
-  uint keylen;
+  size_t keylen;
   /*
     data is stored here, directly after the keylen.
     thus the pointer to data is (void*)(slist_element_ptr+1)
@@ -272,7 +272,7 @@ static LF_SLIST *lsearch(LF_SLIST * volatile *head, CHARSET_INFO *cs,
 }
 
 static inline const uchar* hash_key(const LF_HASH *hash,
-                              const uchar *record, uint *length)
+                                    const uchar *record, size_t *length)
 {
   if (hash->get_key)
     return (*hash->get_key)(record, length, 0);