diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-04-07 15:01:27 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-30 14:58:11 +0200 |
| commit | 0072d2e9a162e87c50988d9f820ae40fdfdf7251 (patch) | |
| tree | 7961ee7948eb782e8492a6e6162e7c6ed6b1e649 /extra | |
| parent | 7a29ca277698ffac757b2bd17c0977fb02b78557 (diff) | |
| download | mariadb-git-0072d2e9a162e87c50988d9f820ae40fdfdf7251.tar.gz | |
InnoDB cleanup: remove a bunch of #ifdef UNIV_INNOCHECKSUM
innochecksum uses global variables. great, let's use them all the
way down, instead of passing them as arguments to innodb internals,
conditionally modifying function prototypes with #ifdefs
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/innochecksum.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc index fa50ca72867..238a5a80ac5 100644 --- a/extra/innochecksum.cc +++ b/extra/innochecksum.cc @@ -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); |