Merge 10.5 into 10.6

2025-07-30 16:24:05 +03:00 · 2022-09-05 14:05:30 +03:00
parent 3c7887a85f ba987a46c9
commit 9fefd440b5
40 changed files with 206 additions and 143 deletions
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@ -58,6 +58,7 @@
 #include "ddl_log.h"
 #include "debug.h"                     // debug_crash_here()
 #include <algorithm>
+#include "wsrep_mysqld.h"

 #ifdef _WIN32
 #include <io.h>