Merge bb-10.5-release into 10.5

3bc6e0ea · Marko Mäkelä · 133b4b46 · 90f43d26 · 3bc6e0ea · 3bc6e0ea
Commit 3bc6e0ea authored Nov 03, 2020 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

mysql-test/suite/innodb/t/foreign_key.combinations mysql-test/suite/innodb/t/foreign_key.combinations +5 -0

storage/innobase/buf/buf0rea.cc storage/innobase/buf/buf0rea.cc +1 -1

No files found.
--- a/mysql-test/suite/innodb/t/foreign_key.combinations
+++ b/mysql-test/suite/innodb/t/foreign_key.combinations
+[read-ahead]
+--innodb-random-read-ahead=ON
+
+[normal]
+--innodb-random-read-ahead=OFF
--- a/storage/innobase/buf/buf0rea.cc
+++ b/storage/innobase/buf/buf0rea.cc
@@ -431,7 +431,7 @@ buf_read_ahead_random(const page_id_t page_id, ulint zip_size, bool ibuf)
  return 0;

 read_ahead:
-  if (!space->acquire_if_not_stopped())
+  if (space->is_stopping())
    goto no_read_ahead;

  /* Read all the suitable blocks within the area */