mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse source
This commit is contained in:
Alexander Barkov 2017-05-05 16:12:54 +04:00
commit ac53b49b1b
398 changed files with 15182 additions and 4342 deletions
Download patch file Download diff file Expand all files Collapse all files

5
extra/innochecksum.cc
View file

@ -571,7 +571,6 @@ is_page_corrupted(
if (mach_read_from_4(buf+FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION) != 0) {
is_corrupted = fil_space_verify_crypt_checksum(
const_cast<byte*>(buf), page_size,
strict_verify, is_log_enabled ? log_file : NULL,
mach_read_from_4(buf
+ FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID),
cur_page_num);
@ -581,9 +580,7 @@ is_page_corrupted(
if (is_corrupted) {
is_corrupted = buf_page_is_corrupted(
true, buf, page_size, NULL,
cur_page_num, strict_verify,
is_log_enabled, log_file);
true, buf, page_size, NULL);
}
return(is_corrupted);