Merge bb-10.5-release into 10.5

2020-11-03 16:24:57 +02:00 · 2020-11-03 16:24:57 +02:00 · 3bc6e0ea66
commit 3bc6e0ea66
parent 133b4b46fe 90f43d260e
2 changed files with 6 additions and 1 deletions
--- a/mysql-test/suite/innodb/t/foreign_key.combinations
+++ b/mysql-test/suite/innodb/t/foreign_key.combinations
@ -0,0 +1,5 @@
+[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 @@ no_read_ahead:
  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 */