Commit 43becedf authored by marko's avatar marko

branches/zip: Cast void* pointers to byte* when doing pointer arithmetics.

parent 0d6bfafd
...@@ -3915,6 +3915,7 @@ btr_store_big_rec_extern_fields( ...@@ -3915,6 +3915,7 @@ btr_store_big_rec_extern_fields(
mlog_write_string(page + FIL_PAGE_DATA mlog_write_string(page + FIL_PAGE_DATA
+ BTR_BLOB_HDR_SIZE, + BTR_BLOB_HDR_SIZE,
(const byte*)
big_rec_vec->fields[i].data big_rec_vec->fields[i].data
+ big_rec_vec->fields[i].len + big_rec_vec->fields[i].len
- extern_len, - extern_len,
......
...@@ -549,9 +549,9 @@ buf_buddy_relocate( ...@@ -549,9 +549,9 @@ buf_buddy_relocate(
mach_read_from_4() calls here will only trigger bogus mach_read_from_4() calls here will only trigger bogus
Valgrind memcheck warnings in UNIV_DEBUG_VALGRIND builds. */ Valgrind memcheck warnings in UNIV_DEBUG_VALGRIND builds. */
bpage = buf_page_hash_get( bpage = buf_page_hash_get(
mach_read_from_4(src mach_read_from_4((const byte*) src
+ FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID), + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID),
mach_read_from_4(src mach_read_from_4((const byte*) src
+ FIL_PAGE_OFFSET)); + FIL_PAGE_OFFSET));
if (!bpage || bpage->zip.data != src) { if (!bpage || bpage->zip.data != src) {
......
...@@ -2366,7 +2366,7 @@ buf_page_init( ...@@ -2366,7 +2366,7 @@ buf_page_init(
" in the hash table: %p, %p\n", " in the hash table: %p, %p\n",
(ulong) space, (ulong) space,
(ulong) offset, (ulong) offset,
hash_page, block); (const void*) hash_page, (const void*) block);
#if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG
mutex_exit(&block->mutex); mutex_exit(&block->mutex);
mutex_exit(&buf_pool->mutex); mutex_exit(&buf_pool->mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment