diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-30 09:23:23 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-30 09:38:56 +0200 |
| commit | 0abd2766b1b82b03a259bae4df0d1c2dc5a5a69d (patch) | |
| tree | 392d3fdcfe227d603fdcc96793506d4fee1867ca /storage/innobase/fil/fil0fil.cc | |
| parent | 35184902db9291ff784742a33cb9019993dfa61c (diff) | |
| parent | 33fdb443ea79207113cf43dbd9469f7ae698b084 (diff) | |
| download | mariadb-git-0abd2766b1b82b03a259bae4df0d1c2dc5a5a69d.tar.gz | |
Merge 10.2 into 10.3
Also, related to MDEV-15522, MDEV-17304, MDEV-17835,
remove the Galera xtrabackup tests, because xtrabackup never worked
with MariaDB Server 10.3 due to InnoDB redo log format changes.
Diffstat (limited to 'storage/innobase/fil/fil0fil.cc')
| -rw-r--r-- | storage/innobase/fil/fil0fil.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index 9247313b392..0c2ee5203cf 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -31,13 +31,13 @@ Created 10/25/1995 Heikki Tuuri #include "buf0buf.h" #include "dict0boot.h" #include "dict0dict.h" +#include "dict0load.h" #include "fsp0file.h" #include "fsp0fsp.h" #include "hash0hash.h" #include "log0log.h" #include "log0recv.h" #include "mach0data.h" -#include "mem0mem.h" #include "mtr0log.h" #include "os0file.h" #include "page0zip.h" |