[MDEV-11684] post-10.1-merge fixes Created: 2016-12-29  Updated: 2017-01-03  Resolved: 2017-01-03

Status: Closed
Project: MariaDB Server
Component/s: OTHER, Storage Engine - InnoDB
Affects Version/s: 10.2
Fix Version/s: 10.2.4

Type: Bug Priority: Critical
Reporter: Sergei Golubchik Assignee: Jan Lindström (Inactive)
Resolution: Fixed Votes: 0
Labels: None

Issue Links:
Relates
relates to MDEV-11713 Optimize DBUG_PRINT and introduce DBU... Closed

 Description   

10.1 is merged into 10.2 now. Two issues are left to fix:

  • encryption.innochecksum test
  • read_page0 vs page_0_crypt_read


 Comments   
Comment by Jan Lindström (Inactive) [ 2016-12-30 ]

No issue on read_page0 (number of times page 0 is read) vs page_0_crypt_read (is crypt data read or not).

Comment by Jan Lindström (Inactive) [ 2016-12-30 ]

http://lists.askmonty.org/pipermail/commits/2016-December/010358.html

Comment by Sergei Golubchik [ 2016-12-30 ]

jplindst, fil_space_t::read_page0 is bool, it cannot be "number of times".

Comment by Jan Lindström (Inactive) [ 2016-12-30 ]

Ah, confused i to ulint_ctr_64_t page0_read

Comment by Marko Mäkelä [ 2017-01-03 ]

This patch appears to address serg’s comment:
http://lists.askmonty.org/pipermail/commits/2016-December/010361.html

Comment by Jan Lindström (Inactive) [ 2017-01-03 ]

commit a0d396fd3f5f86e09f602ac9f76b8d9f2e739221
Author: Jan Lindström <jan.lindstrom@mariadb.com>
Date: Tue Jan 3 14:35:08 2017 +0200

MDEV-11684: post-10.1-merge fixes

10.1 is merged into 10.2 now. Two issues are left to fix:
(1) encryption.innochecksum test
(2) read_page0 vs page_0_crypt_read

(1) innochecksum tool did not compile after merge because
buf_page_is_corrupted uses fil_crypt_t that has been changed.

extra/CMakeLists.txt: Added fil/fil0crypt.cc as dependency
as we need to use fil_crypt_verify_checksum for encrypted pages.

innochecksum.cc: If we think page is encrypted i.e.
FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION != 0 we call
fil_crypt_verify_checksum() function to compare calculated
checksum to stored checksum calculated after encryption
(this is stored on different offset i.e.
FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION + 4).
If checksum does not match we call normal buf_page_is_corrupted
to compare calculated checksum to stored checksum.

fil0crypt.cc: add #ifdef UNIV_INNOCHECKSUM to be able to compile
this file for innochecksum tool.

(2) read_page0 is not needed and thus removed.

Generated at Thu Feb 08 07:51:52 UTC 2024 using Jira 8.20.16#820016-sha1:9d11dbea5f4be3d4cc21f03a88dd11d8c8687422.