summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-04-15 13:07:53 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-04-15 13:07:53 +0300
commite4c5551964f398ebbe2b1b34fef028eff6f22fbe (patch)
treefda2a5329a5f91ee6f1fe5e101042d6e8fb5d1ee
parentc2a2e72164d0056ca267f9f37ef1b061fa1520bf (diff)
downloadmariadb-git-e4c5551964f398ebbe2b1b34fef028eff6f22fbe.tar.gz
MDEV-13564: Temporarily restore a call to work around a bugbb-10.4-MDEV-19253
srv_start(): Restore the call to buf_pool_invalidate() that was removed in commit 09af00cbde1d62dfda574dee10e5c0fd240c3f7f. It turns out that the call is necessary to work around a bug that should be fixed in MDEV-19229.
-rw-r--r--storage/innobase/srv/srv0start.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc
index d67c6c02b2f..085ab55a5aa 100644
--- a/storage/innobase/srv/srv0start.cc
+++ b/storage/innobase/srv/srv0start.cc
@@ -1837,6 +1837,14 @@ files_checked:
return(srv_init_abort(err));
}
} else {
+ /* Work around the bug that we were performing a dirty read of
+ at least the TRX_SYS page into the buffer pool above, without
+ reading or applying any redo logs.
+
+ MDEV-19229 FIXME: Remove the dirty reads and this call.
+ Add an assertion that the buffer pool is empty. */
+ buf_pool_invalidate();
+
/* We always try to do a recovery, even if the database had
been shut down normally: this is the normal startup path */