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 /storage/innobase/include/srv0mon.h | |
| 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 'storage/innobase/include/srv0mon.h')
| -rw-r--r-- | storage/innobase/include/srv0mon.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/innobase/include/srv0mon.h b/storage/innobase/include/srv0mon.h index 6c90184a95a..397787802d4 100644 --- a/storage/innobase/include/srv0mon.h +++ b/storage/innobase/include/srv0mon.h @@ -37,6 +37,7 @@ Created 12/15/2009 Jimmy Yang #endif /* __STDC_LIMIT_MACROS */ #include <stdint.h> +#include "my_atomic.h" /** Possible status values for "mon_status" in "struct monitor_value" */ enum monitor_running_status { |