revision-id: f638c37abe1ab2e84746829a05144528b8953432 (mariadb-10.2.14-43-gf638c37abe1) parent(s): e341da4711d80a8150ac26b2fe1ed4b035c13754 author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-13 09:44:28 +0300 message: MDEV-12632: Source and destination overlap in memcpy, encryption.innodb-discard-import-change fails in buildbot with valgrind Use block->page.offset for checking page number. --- storage/innobase/row/row0import.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc index dad16c1f54e..c699b2117be 100644 --- a/storage/innobase/row/row0import.cc +++ b/storage/innobase/row/row0import.cc @@ -3464,7 +3464,7 @@ fil_iterate( /* When tablespace is encrypted or compressed its first page (i.e. page 0) is not encrypted or compressed and there is no need to copy frame. */ - if (encrypted && i != 0) { + if (encrypted && block->page.id.page_no() != 0) { byte *local_frame = callback.get_frame(block); ut_ad((writeptr + (i * size)) != local_frame); memcpy((writeptr + (i * size)), local_frame, size);