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/mem0mem.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/mem0mem.h')
| -rw-r--r-- | storage/innobase/include/mem0mem.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/storage/innobase/include/mem0mem.h b/storage/innobase/include/mem0mem.h index f299fc84b5e..a2d676e7f2a 100644 --- a/storage/innobase/include/mem0mem.h +++ b/storage/innobase/include/mem0mem.h @@ -27,9 +27,7 @@ Created 6/9/1994 Heikki Tuuri #ifndef mem0mem_h #define mem0mem_h -#include "univ.i" #include "ut0mem.h" -#include "ut0byte.h" #include "ut0rnd.h" #include "mach0data.h" |