diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-17 22:35:32 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-17 22:35:32 +0200 |
| commit | fae7e350a8db2b8ef3541307506809ebe3071967 (patch) | |
| tree | 82ed7a0d229648842dd4a45971b6a132a3ab73be | |
| parent | 7d245083a43e34d94822e580037727bdbb50b6f0 (diff) | |
| parent | 51a1fc737c26570386220edd4d8e69e873b8dfa7 (diff) | |
| download | mariadb-git-fae7e350a8db2b8ef3541307506809ebe3071967.tar.gz | |
Merge 10.1 into 10.2
| -rw-r--r-- | storage/innobase/fil/fil0crypt.cc | 3 | ||||
| -rw-r--r-- | storage/xtradb/fil/fil0crypt.cc | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc index d7df8553dcb..829c40278f0 100644 --- a/storage/innobase/fil/fil0crypt.cc +++ b/storage/innobase/fil/fil0crypt.cc @@ -2596,4 +2596,7 @@ fil_space_verify_crypt_checksum(const byte* page, const page_size_t& page_size) return checksum == buf_calc_page_crc32(page) || checksum == buf_calc_page_new_checksum(page); } + + ut_ad(!"unhandled innodb_checksum_algorithm"); + return false; } diff --git a/storage/xtradb/fil/fil0crypt.cc b/storage/xtradb/fil/fil0crypt.cc index afb367efc3c..71269cf5e7b 100644 --- a/storage/xtradb/fil/fil0crypt.cc +++ b/storage/xtradb/fil/fil0crypt.cc @@ -2630,4 +2630,7 @@ bool fil_space_verify_crypt_checksum(const byte* page, ulint zip_size) return checksum == buf_calc_page_crc32(page) || checksum == buf_calc_page_new_checksum(page); } + + ut_ad(!"unhandled innodb_checksum_algorithm"); + return false; } |