summaryrefslogtreecommitdiff
path: root/storage/innobase/include/row0undo.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-11-30 09:23:23 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-11-30 09:38:56 +0200
commit0abd2766b1b82b03a259bae4df0d1c2dc5a5a69d (patch)
tree392d3fdcfe227d603fdcc96793506d4fee1867ca /storage/innobase/include/row0undo.h
parent35184902db9291ff784742a33cb9019993dfa61c (diff)
parent33fdb443ea79207113cf43dbd9469f7ae698b084 (diff)
downloadmariadb-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/row0undo.h')
-rw-r--r--storage/innobase/include/row0undo.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/storage/innobase/include/row0undo.h b/storage/innobase/include/row0undo.h
index f7cec643b33..5ac2c7c5ee0 100644
--- a/storage/innobase/include/row0undo.h
+++ b/storage/innobase/include/row0undo.h
@@ -27,13 +27,9 @@ Created 1/8/1997 Heikki Tuuri
#ifndef row0undo_h
#define row0undo_h
-#include "univ.i"
-#include "mtr0mtr.h"
#include "trx0sys.h"
#include "btr0types.h"
#include "btr0pcur.h"
-#include "dict0types.h"
-#include "trx0types.h"
#include "que0types.h"
#include "row0types.h"