diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-05 16:51:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-05 16:51:26 +0300 |
| commit | 680463a8d991389f4ea5942e87764137c55c0eb4 (patch) | |
| tree | 427f8946aa9085c7f6346e1047144995cb7c459e /storage/innobase/fil/fil0crypt.cc | |
| parent | 05693cf2149f8792863a32325090e789015286fc (diff) | |
| parent | efc70da5fd0459ff44153529d13651741cc32bc4 (diff) | |
| download | mariadb-git-680463a8d991389f4ea5942e87764137c55c0eb4.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/fil/fil0crypt.cc')
| -rw-r--r-- | storage/innobase/fil/fil0crypt.cc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc index 493500d8648..282b66936a8 100644 --- a/storage/innobase/fil/fil0crypt.cc +++ b/storage/innobase/fil/fil0crypt.cc @@ -298,14 +298,9 @@ fil_space_read_crypt_data(const page_size_t& page_size, const byte* page) type == CRYPT_SCHEME_1) || iv_length != sizeof crypt_data->iv) { ib::error() << "Found non sensible crypt scheme: " - << type << "," << iv_length << " for space: " - << page_get_space_id(page) << " offset: " - << offset << " bytes: [" - << page[offset + 2 + MAGIC_SZ] - << page[offset + 3 + MAGIC_SZ] - << page[offset + 4 + MAGIC_SZ] - << page[offset + 5 + MAGIC_SZ] - << "]."; + << type << "," << iv_length + << " for space: " + << page_get_space_id(page); return NULL; } @@ -724,8 +719,10 @@ fil_space_decrypt( } ib::fatal() << "Unable to decrypt data-block " - << " src: " << src << "srclen: " - << srclen << " buf: " << dst << "buflen: " + << " src: " << static_cast<const void*>(src) + << "srclen: " + << srclen << " buf: " + << static_cast<const void*>(dst) << "buflen: " << dstlen << " return-code: " << rc << " Can't continue!"; } @@ -1078,6 +1075,7 @@ struct rotate_thread_t { case SRV_SHUTDOWN_EXIT_THREADS: /* srv_init_abort() must have been invoked */ case SRV_SHUTDOWN_CLEANUP: + case SRV_SHUTDOWN_INITIATED: return true; case SRV_SHUTDOWN_FLUSH_PHASE: case SRV_SHUTDOWN_LAST_PHASE: |