1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-7878: innodb_scrub_background fails sporadically in buildbot (Failing assertion: offset > 0 && offset < UNIV_PAGE_SIZE)

Browse Source 
Problem was that when encrypted space was flushed page 0 is
also updated but crypt data offset was sometimes not
calculated.
This commit is contained in:
Jan Lindström 2015-03-31 09:00:01 +03:00
parent f573b65e41
commit cbc5157feb
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
storage/innobase/fil/fil0crypt.cc
View File

@ -2033,6 +2033,9 @@ fil_crypt_flush_space(rotate_thread_t *state, ulint space)
RW_X_LATCH, NULL, BUF_GET,
__FILE__, __LINE__, &mtr);
byte* frame = buf_block_get_frame(block);
ulint maxsize = 0;
crypt_data->page0_offset =
fsp_header_get_crypt_offset(zip_size, &maxsize);
fil_space_write_crypt_data(space, frame,
crypt_data->page0_offset,
ULINT_MAX, &mtr);

3
storage/xtradb/fil/fil0crypt.cc
View File

@ -2033,6 +2033,9 @@ fil_crypt_flush_space(rotate_thread_t *state, ulint space)
RW_X_LATCH, NULL, BUF_GET,
__FILE__, __LINE__, &mtr);
byte* frame = buf_block_get_frame(block);
ulint maxsize = 0;
crypt_data->page0_offset =
fsp_header_get_crypt_offset(zip_size, &maxsize);
fil_space_write_crypt_data(space, frame,
crypt_data->page0_offset,
ULINT_MAX, &mtr);