diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-08-22 10:56:10 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-08-22 10:56:10 +0300 |
| commit | d430e5bfc1327de723911aa22f26eb83b46c6592 (patch) | |
| tree | 6be3637d52e87e26e71bcd7424457a2d935a2085 /mysys | |
| parent | a1f80c1e70d9c5d55915ced453675269067f7517 (diff) | |
| download | mariadb-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')
| -rw-r--r-- | mysys/lf_hash.c | 8 | ||||
| -rw-r--r-- | mysys/my_safehash.c | 2 |
2 files changed, 5 insertions, 5 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); 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; |