diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-15 16:18:28 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-15 16:18:28 +0200 |
| commit | 4f6830255c1dfcba3ec18aaedf6233713a7756c1 (patch) | |
| tree | f4e094735eda628a4fc6aaba4438e7465dbba137 | |
| parent | 4ca5a0ec98df58f7487e4ee0f7294810068b8443 (diff) | |
| parent | 92ff7bb63fee54a932ca0b7d8092af5aac1ded57 (diff) | |
| download | mariadb-git-4f6830255c1dfcba3ec18aaedf6233713a7756c1.tar.gz | |
Merge 10.5 into 10.6
| -rw-r--r-- | storage/innobase/include/fil0fil.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h index 7837020fec4..d147dbf203e 100644 --- a/storage/innobase/include/fil0fil.h +++ b/storage/innobase/include/fil0fil.h @@ -1603,9 +1603,10 @@ template<bool have_reference> inline void fil_space_t::flush() } else if (have_reference) flush_low(); - else if (!(acquire_low() & STOPPING)) + else { - flush_low(); + if (!(acquire_low() & (STOPPING | CLOSING))) + flush_low(); release(); } } |