Merge 10.5 into 10.6

MariaDB · Dec 15, 2022 · 4f68302 · 4f68302
2 parents 4ca5a0e + 92ff7bb
commit 4f68302
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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();
   }
 }