From 03e461634d725a66917f8161443710f4338a5b1e Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Wed, 19 Sep 2018 20:34:03 +0400 Subject: MDEV-17441 - InnoDB transition to C++11 atomics fil_validate_count transition to Atomic_counter. --- storage/innobase/include/dict0dict.h | 1 - storage/innobase/include/univ.i | 1 + storage/innobase/include/ut0counter.h | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) (limited to 'storage/innobase/include') diff --git a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h index 3530f6bd4d2..8022b68434b 100644 --- a/storage/innobase/include/dict0dict.h +++ b/storage/innobase/include/dict0dict.h @@ -31,7 +31,6 @@ Created 1/8/1996 Heikki Tuuri #include "data0data.h" #include "dict0mem.h" #include "fsp0fsp.h" -#include #include extern bool innodb_table_stats_not_found; diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index a3b50950393..66bfaf89142 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -83,6 +83,7 @@ used throughout InnoDB but do not include too much themselves. They support cross-platform development and expose comonly used SQL names. */ #include +#include "my_counter.h" /* JAN: TODO: missing 5.7 header */ #ifdef HAVE_MY_THREAD_H diff --git a/storage/innobase/include/ut0counter.h b/storage/innobase/include/ut0counter.h index 653515a3d7d..1fc2c297e8d 100644 --- a/storage/innobase/include/ut0counter.h +++ b/storage/innobase/include/ut0counter.h @@ -29,7 +29,6 @@ Created 2012/04/12 by Sunny Bains #define ut0counter_h #include "os0thread.h" -#include #include "my_rdtsc.h" /** CPU cache line size */ -- cgit v1.2.1