diff options
| -rw-r--r-- | mysql-test/r/rpl_events.result | 6 | ||||
| -rw-r--r-- | mysys/lf_hash.c | 8 | ||||
| -rw-r--r-- | mysys/my_safehash.c | 2 | ||||
| -rw-r--r-- | storage/maria/unittest/ma_test_loghandler_max_lsn-t.c | 1 |
4 files changed, 7 insertions, 10 deletions
diff --git a/mysql-test/r/rpl_events.result b/mysql-test/r/rpl_events.result index 2cb9a4ab62f..18fe72a9879 100644 --- a/mysql-test/r/rpl_events.result +++ b/mysql-test/r/rpl_events.result @@ -122,15 +122,13 @@ SELECT * FROM t1 ORDER BY id; id c ts 1 manually TIMESTAMP 2 from justonce TIMESTAMP -4 from er TIMESTAMP -affected rows: 3 +affected rows: 2 "Checking event data on the slave" SELECT * FROM t1 ORDER BY id; id c ts 1 manually TIMESTAMP 2 from justonce TIMESTAMP -4 from er TIMESTAMP -affected rows: 3 +affected rows: 2 "Checking event is inactive on slave" SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'justonce'; db name status originator 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; diff --git a/storage/maria/unittest/ma_test_loghandler_max_lsn-t.c b/storage/maria/unittest/ma_test_loghandler_max_lsn-t.c index 8bd05e82bbf..c50681434e3 100644 --- a/storage/maria/unittest/ma_test_loghandler_max_lsn-t.c +++ b/storage/maria/unittest/ma_test_loghandler_max_lsn-t.c @@ -23,7 +23,6 @@ int main(int argc __attribute__((unused)), char *argv[]) uchar long_tr_id[6]; PAGECACHE pagecache; LSN lsn, max_lsn, last_lsn= LSN_IMPOSSIBLE; - MY_STAT st; LEX_STRING parts[TRANSLOG_INTERNAL_PARTS + 1]; MY_INIT(argv[0]); |