From f5c080c7353cc9c30d0b269c07024cd38253c3bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 27 Jun 2019 14:58:43 +0300 Subject: MDEV-19845: Fix the build on some platforms On some platforms, MY_RELAX_CPU() falls back to an atomic memory operation, but my_cpu.h fails to include my_atomic.h. --- mysys/my_cpu.c | 1 + storage/innobase/include/ib0mutex.h | 1 + 2 files changed, 2 insertions(+) diff --git a/mysys/my_cpu.c b/mysys/my_cpu.c index dd8ff4b6a02..9434bceac41 100644 --- a/mysys/my_cpu.c +++ b/mysys/my_cpu.c @@ -14,6 +14,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include +#include #include #ifdef HAVE_PAUSE_INSTRUCTION diff --git a/storage/innobase/include/ib0mutex.h b/storage/innobase/include/ib0mutex.h index 3e99eb79416..e496c65e46a 100644 --- a/storage/innobase/include/ib0mutex.h +++ b/storage/innobase/include/ib0mutex.h @@ -29,6 +29,7 @@ Created 2013-03-26 Sunny Bains. #ifndef ib0mutex_h #define ib0mutex_h +#include "my_atomic.h" #include "my_cpu.h" #include "os0event.h" #include "sync0arr.h" -- cgit v1.2.1