Merge branch '10.1' into 10.2

Revert commit db0917f68f, because the fix for MDEV-12696 is coming from 5.5 and 10.1 in this merge.
2025-08-08 11:22:35 +03:00 · 2017-05-09 13:24:52 +02:00
parent 2645bda5f2 c92168fcd2
commit c91ecf9e9b
84 changed files with 1292 additions and 376 deletions
--- a/include/mysql/psi/mysql_file.h
+++ b/include/mysql/psi/mysql_file.h
@@ -1423,4 +1423,3 @@ inline_mysql_file_sync(
 /** @} (end of group File_instrumentation) */

 #endif
-