mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 02:30:06 +01:00
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.
This commit is contained in:
parent
fe20fe0d0a
commit
71ceed7523
1 changed files with 1 additions and 1 deletions
|
@ -3463,7 +3463,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);
|
||||
|
|
Loading…
Add table
Reference in a new issue