diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-03 11:22:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-03 11:53:57 +0300 |
| commit | 9dfef6e29b98459a5077adb95d5b989d39e0db24 (patch) | |
| tree | cc3e52ca7b38bdc9fda291eea3fb2eb7b38c5785 /storage/innobase/buf | |
| parent | b963cbaf4bcfe2c510c38edeacc2d6b1cae2d7a1 (diff) | |
| download | mariadb-git-9dfef6e29b98459a5077adb95d5b989d39e0db24.tar.gz | |
Fix -Wclass-memaccess warnings in InnoDB,XtraDB
Diffstat (limited to 'storage/innobase/buf')
| -rw-r--r-- | storage/innobase/buf/buf0buf.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/buf/buf0lru.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index f534f8906f4..11dceacf592 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -1611,7 +1611,7 @@ buf_relocate( } #endif /* UNIV_DEBUG */ - memcpy(dpage, bpage, sizeof *dpage); + new (dpage) buf_page_t(*bpage); ut_d(bpage->in_LRU_list = FALSE); ut_d(bpage->in_page_hash = FALSE); diff --git a/storage/innobase/buf/buf0lru.cc b/storage/innobase/buf/buf0lru.cc index 019dddb5863..5b0a2a7dd0c 100644 --- a/storage/innobase/buf/buf0lru.cc +++ b/storage/innobase/buf/buf0lru.cc @@ -1849,7 +1849,7 @@ func_exit: } else if (buf_page_get_state(bpage) == BUF_BLOCK_FILE_PAGE) { b = buf_page_alloc_descriptor(); ut_a(b); - memcpy(b, bpage, sizeof *b); + new (b) buf_page_t(*bpage); } ut_ad(buf_pool_mutex_own(buf_pool)); |