diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-04 13:11:05 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-07 12:39:38 +0300 |
| commit | 2ef7a5a13a988842450cbeeaceaf0ea1a78a3c27 (patch) | |
| tree | f829131f9dbc4afbda264ec977a1c50dfe336ebf /storage/innobase/page/page0zip.cc | |
| parent | 19f2b3d02f1ae8028bcc388e9fd161737056f1fe (diff) | |
| download | mariadb-git-2ef7a5a13a988842450cbeeaceaf0ea1a78a3c27.tar.gz | |
MDEV-13443: Port innochecksum tests from 10.2 innodb_zip suite to 10.1
This is basically port of WL6045:Improve Innochecksum with some
code refactoring on innochecksum.
Added page0size.h include from 10.2 to make 10.1 vrs 10.2 innochecksum
as identical as possible.
Added page 0 checksum checking and if that fails whole test fails.
Diffstat (limited to 'storage/innobase/page/page0zip.cc')
| -rw-r--r-- | storage/innobase/page/page0zip.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/innobase/page/page0zip.cc b/storage/innobase/page/page0zip.cc index 6e26f830fe6..b580ba6d098 100644 --- a/storage/innobase/page/page0zip.cc +++ b/storage/innobase/page/page0zip.cc @@ -4950,7 +4950,7 @@ page_zip_verify_checksum( } #ifdef UNIV_INNOCHECKSUM if (log_file) { - fprintf(log_file, "Page::%lu is empty and" + fprintf(log_file, "Page::%llu is empty and" " uncorrupted\n", cur_page_num); } #endif /* UNIV_INNOCHECKSUM */ @@ -4970,7 +4970,7 @@ page_zip_verify_checksum( #ifdef UNIV_INNOCHECKSUM if (log_file) { - fprintf(log_file, "page::%lu;" + fprintf(log_file, "page::%llu;" " %s checksum: calculated = %u;" " recorded = %u\n", cur_page_num, buf_checksum_algorithm_name( @@ -4985,10 +4985,10 @@ page_zip_verify_checksum( data, size, SRV_CHECKSUM_ALGORITHM_CRC32); if (log_file) { - fprintf(log_file, "page::%lu: crc32 checksum:" + fprintf(log_file, "page::%llu: crc32 checksum:" " calculated = %u; recorded = %u\n", cur_page_num, crc32, stored); - fprintf(log_file, "page::%lu: none checksum:" + fprintf(log_file, "page::%llu: none checksum:" " calculated = %lu; recorded = %u\n", cur_page_num, BUF_NO_CHECKSUM_MAGIC, stored); } |