diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-25 21:57:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-25 21:57:52 +0300 |
| commit | fbe2712705d464bf8488df249c36115e2c1f63f7 (patch) | |
| tree | 274e728c719611769288afcb10f79549f6e11f8c /mysys/waiting_threads.c | |
| parent | 62903434eb009cb0bcd5003b0a45914bd4c09886 (diff) | |
| parent | a19782522b1eac52d72f5e787b5d96f1fd1a2cb7 (diff) | |
| download | mariadb-git-fbe2712705d464bf8488df249c36115e2c1f63f7.tar.gz | |
Merge 10.4 into 10.5
The functional changes of commit 5836191c8f0658d5d75484766fdcc3d838b0a5c1
(MDEV-21168) are omitted due to MDEV-742 having addressed the issue.
Diffstat (limited to 'mysys/waiting_threads.c')
| -rw-r--r-- | mysys/waiting_threads.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/waiting_threads.c b/mysys/waiting_threads.c index 2a97c6133e8..dd60088d534 100644 --- a/mysys/waiting_threads.c +++ b/mysys/waiting_threads.c @@ -175,6 +175,7 @@ #include <my_global.h> #include <waiting_threads.h> #include <m_string.h> +#include "my_cpu.h" /* status variables */ |