diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 16:24:57 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 16:24:57 +0200 |
| commit | 3bc6e0ea66b10403877cf629238971992eb8b955 (patch) | |
| tree | 3031a212f4304df8ebe47e116175aefca653af51 | |
| parent | 133b4b46fefde402542214d8226262534dc3601a (diff) | |
| parent | 90f43d260e407c650aa8a7885d674c717618cc37 (diff) | |
| download | mariadb-git-3bc6e0ea66b10403877cf629238971992eb8b955.tar.gz | |
Merge bb-10.5-release into 10.5
| -rw-r--r-- | mysql-test/suite/innodb/t/foreign_key.combinations | 5 | ||||
| -rw-r--r-- | storage/innobase/buf/buf0rea.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/t/foreign_key.combinations b/mysql-test/suite/innodb/t/foreign_key.combinations new file mode 100644 index 00000000000..53d4cff5ca7 --- /dev/null +++ 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 diff --git a/storage/innobase/buf/buf0rea.cc b/storage/innobase/buf/buf0rea.cc index 2f59f1ae4d5..3b49525502a 100644 --- 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 */ |