Merge 10.5 into 10.6

4f683025 · Marko Mäkelä · 4ca5a0ec · 92ff7bb6 · 4f683025
Commit 4f683025 authored Dec 15, 2022 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

storage/innobase/include/fil0fil.h storage/innobase/include/fil0fil.h +3 -2

No files found.
--- 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();
  }
 }