diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-02-07 08:51:20 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-02-07 08:51:20 +0200 |
| commit | 8b6cfda631253c805687d94f2f1aaa17fd2ef0e2 (patch) | |
| tree | 9460953eeb7967bc56383bccc8c7af2adf81a694 /mysys | |
| parent | 8b97eba31ba3b8af6a93b4836b14d52e1c377900 (diff) | |
| parent | c1eaa385ffb44bdf6264d2cc4b4cc0e10284c88a (diff) | |
| download | mariadb-git-8b6cfda631253c805687d94f2f1aaa17fd2ef0e2.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_cpu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysys/my_cpu.c b/mysys/my_cpu.c index 72705263aae..52500d78ef7 100644 --- a/mysys/my_cpu.c +++ b/mysys/my_cpu.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2019, MariaDB Corporation. +/* Copyright (c) 2019, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include <my_global.h> -#include <my_atomic.h> #include <my_cpu.h> #include <my_rdtsc.h> |