diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-04-13 09:25:52 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-04-13 09:44:28 +0300 |
| commit | f638c37abe1ab2e84746829a05144528b8953432 (patch) | |
| tree | 98f60c09fd40bc45c3ab7f79c7ed72dde2bb3048 /storage | |
| parent | e341da4711d80a8150ac26b2fe1ed4b035c13754 (diff) | |
| download | mariadb-git-f638c37abe1ab2e84746829a05144528b8953432.tar.gz | |
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.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/row/row0import.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ page_corrupted: /* 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); |