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 /extra/mariabackup | |
| 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 'extra/mariabackup')
| -rw-r--r-- | extra/mariabackup/ds_local.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/extra/mariabackup/ds_local.cc b/extra/mariabackup/ds_local.cc index 1d24111b557..58353365cd6 100644 --- a/extra/mariabackup/ds_local.cc +++ b/extra/mariabackup/ds_local.cc @@ -23,7 +23,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA #include <mysys_err.h> #include "common.h" #include "datasink.h" -#include "univ.i" #include "fsp0fsp.h" #ifdef _WIN32 #include <winioctl.h> |