diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-23 10:50:14 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-23 10:50:14 +0200 |
| commit | 3b250837858c137f3a4082af6c0a20f95fde31d4 (patch) | |
| tree | 9224188f329bb77443e9eb35680f91039e51adaf /client | |
| parent | 1a4998e98271ffd8126331336c4c4ae71029afc7 (diff) | |
| parent | f7599f47999bb197dba36e54d0d5677b3b15f12a (diff) | |
| download | mariadb-git-3b250837858c137f3a4082af6c0a20f95fde31d4.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlbinlog.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 05983b57f4e..36576ed029c 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -41,6 +41,7 @@ /* That one is necessary for defines of OPTION_NO_FOREIGN_KEY_CHECKS etc */ #include "sql_priv.h" #include "sql_basic_types.h" +#include <atomic> #include "log_event.h" #include "compat56.h" #include "sql_common.h" |