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/btr0pcur.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/btr0pcur.h')
-rw-r--r-- | storage/innobase/include/btr0pcur.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/storage/innobase/include/btr0pcur.h b/storage/innobase/include/btr0pcur.h index 747ad676e33..b69d07811f3 100644 --- a/storage/innobase/include/btr0pcur.h +++ b/storage/innobase/include/btr0pcur.h @@ -27,14 +27,9 @@ Created 2/23/1996 Heikki Tuuri #ifndef btr0pcur_h #define btr0pcur_h -#include "univ.i" #include "dict0dict.h" -#include "data0data.h" -#include "mtr0mtr.h" -#include "page0cur.h" #include "btr0cur.h" #include "btr0btr.h" -#include "btr0types.h" #include "gis0rtree.h" /* Relative positions for a stored cursor position */ |