diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-19 14:33:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-19 14:33:08 +0300 |
| commit | d2e96e492a00dc4e31ff2eee752ddcd8c2c31c99 (patch) | |
| tree | d18da79242ad5fd8e957f82e56f567c9cffe8b50 /storage/innobase/include | |
| parent | 49b29e35b2099fcbc3342814fc0ce9c17ba1bdeb (diff) | |
| parent | fa0397849a002a0417085aaea289b0c95c96520a (diff) | |
| download | mariadb-git-d2e96e492a00dc4e31ff2eee752ddcd8c2c31c99.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/include')
| -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 397787802d4..b00b9160044 100644 --- a/storage/innobase/include/srv0mon.h +++ b/storage/innobase/include/srv0mon.h @@ -38,6 +38,7 @@ Created 12/15/2009 Jimmy Yang #include <stdint.h> #include "my_atomic.h" +#include "my_atomic_wrapper.h" /** Possible status values for "mon_status" in "struct monitor_value" */ enum monitor_running_status { |