Merge tag 'mariadb-10.0.31' into 10.0-galera

Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
2025-08-08 11:22:35 +03:00 · 2017-05-30 15:28:52 +05:30
parent 0e3170e30d 725e47bfb5
commit 92209ac6f6
491 changed files with 11595 additions and 7885 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
-