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/include/fsp0fsp.h | |
| 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/include/fsp0fsp.h')
| -rw-r--r-- | storage/innobase/include/fsp0fsp.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/storage/innobase/include/fsp0fsp.h b/storage/innobase/include/fsp0fsp.h index 79098b71375..76c7762fac3 100644 --- a/storage/innobase/include/fsp0fsp.h +++ b/storage/innobase/include/fsp0fsp.h @@ -27,8 +27,6 @@ Created 12/18/1995 Heikki Tuuri #ifndef fsp0fsp_h #define fsp0fsp_h -#include "univ.i" - #include "fsp0types.h" #ifndef UNIV_INNOCHECKSUM @@ -40,7 +38,6 @@ Created 12/18/1995 Heikki Tuuri #include "ut0byte.h" #endif /* !UNIV_INNOCHECKSUM */ -#include "fsp0types.h" /** @return the PAGE_SSIZE flags for the current innodb_page_size */ #define FSP_FLAGS_PAGE_SSIZE() \ |