diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-16 10:54:33 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-16 10:54:33 +0200 |
| commit | 8bddaddc6fcd4f146252c2dc149ecbc51cd6c788 (patch) | |
| tree | f5c359b1c9ab641ee139fcb8c2d83a93dec8e7d0 /storage/innobase/include/fil0fil.h | |
| parent | 89480340ba7eabfaff1ea8f51437324cb3d5964f (diff) | |
| parent | 84774de49af133b6e702e51c0b0e69173a0594cd (diff) | |
| download | mariadb-git-8bddaddc6fcd4f146252c2dc149ecbc51cd6c788.tar.gz | |
Merge 10.7 into 10.8
Diffstat (limited to 'storage/innobase/include/fil0fil.h')
| -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 09626569f09..940e1b68458 100644 --- a/storage/innobase/include/fil0fil.h +++ b/storage/innobase/include/fil0fil.h @@ -1534,9 +1534,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(); } } |