Skip to content

Commit

Permalink
MDEV-12632: Source and destination overlap in memcpy, encryption.inno…
Browse files Browse the repository at this point in the history
…db-discard-import-change fails in buildbot with valgrind

Use block->page.offset for checking page number.
  • Loading branch information
Jan Lindström committed Apr 13, 2018
1 parent e341da4 commit f638c37
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion storage/innobase/row/row0import.cc
Expand Up @@ -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);
Expand Down

0 comments on commit f638c37

Please sign in to comment.