summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlad Lesin <vlad_lesin@mail.ru>2021-02-11 17:16:14 +0300
committerVlad Lesin <vlad_lesin@mail.ru>2021-02-11 17:16:14 +0300
commit0e54381dd113242249a1b82887b69ec932f48cc2 (patch)
tree4b0ebf228586763065c1b5ee245080a6fbae78f7
parenta1074340ff2ab4107e11efd8c2095b0a0c7ef077 (diff)
downloadmariadb-git-bb-10.4-MDEV-24792-enc-freed-pages.tar.gz
MDEV-24792 Assertion `!newest_lsn || fil_page_get_type(page)' failed upon MariaBackup prepare in buf_flush_init_for_writing with innodb_log_optimize_ddl=offbb-10.4-MDEV-24792-enc-freed-pages
Remove some mess in the code.
-rw-r--r--storage/innobase/fil/fil0crypt.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc
index e357789349f..5502fbf1dbd 100644
--- a/storage/innobase/fil/fil0crypt.cc
+++ b/storage/innobase/fil/fil0crypt.cc
@@ -1889,12 +1889,12 @@ fil_crypt_get_page_throttle_func(
if (space->is_stopping()) {
return NULL;
}
-//#if 0
+
if (fseg_page_is_free(space, state->offset)) {
/* page is already freed */
return NULL;
}
-//#endif
+
state->crypt_stat.pages_read_from_disk++;
const ulonglong start = my_interval_timer();