Merge 10.4 into 10.5

2025-08-08 11:22:35 +03:00 · 2020-03-23 10:50:14 +02:00
parent 1a4998e982 f7599f4799
commit 3b25083785
22 changed files with 76 additions and 75 deletions
--- a/unittest/mysys/thr_template.c
+++ b/unittest/mysys/thr_template.c
@@ -16,7 +16,6 @@

 #include <my_global.h>
 #include <my_sys.h>
-#include <my_atomic.h>
 #include <tap.h>

 volatile uint32 bad;