diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-04-29 10:05:39 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-04-29 10:05:39 +0300 |
| commit | 935a1c676e1fbfea7950d69c410a59a29a50857a (patch) | |
| tree | b6c981c98e6b2356d671099ccad4e2d7029c06ba /storage/xtradb | |
| parent | 57795bb43609aff0e8fe9789c9f841b8c45ba79c (diff) | |
| download | mariadb-git-935a1c676e1fbfea7950d69c410a59a29a50857a.tar.gz | |
MDEV-12623: InnoDB: Failing assertion: kv == 0
|| kv >= crypt_data->min_key_version,
encryption.innodb_encryption_tables failed in buildbot.
Now that key_version is not stored when page is read to
buf_page_t::key_version but always read from actual page
this assertion is not always valid.
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/fil/fil0crypt.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/storage/xtradb/fil/fil0crypt.cc b/storage/xtradb/fil/fil0crypt.cc index 3537ad2c66a..14b6bd1306d 100644 --- a/storage/xtradb/fil/fil0crypt.cc +++ b/storage/xtradb/fil/fil0crypt.cc @@ -1976,11 +1976,6 @@ fil_crypt_rotate_page( kv, key_state->key_version, key_state->rotate_key_age)) { - /* page can be "fresh" i.e never written in case - * kv == 0 or it should have a key version at least - * as big as the space minimum key version*/ - ut_a(kv == 0 || kv >= crypt_data->min_key_version); - modified = true; /* force rotation by dummy updating page */ @@ -1992,9 +1987,6 @@ fil_crypt_rotate_page( state->crypt_stat.pages_modified++; } else { if (crypt_data->is_encrypted()) { - ut_a(kv >= crypt_data->min_key_version || - (kv == 0 && key_state->key_version == 0)); - if (kv < state->min_key_version_found) { state->min_key_version_found = kv; } |