6 files changed, 15 insertions, 12 deletions
diff --git a/mysql-test/suite/galera_3nodes/r/galera_innobackupex_backup.result b/mysql-test/suite/galera_3nodes/r/galera_mariabackup_backup.result
index e3935c32fda..e3935c32fda 100644
--- a/mysql-test/suite/galera_3nodes/r/galera_innobackupex_backup.result
+++ b/mysql-test/suite/galera_3nodes/r/galera_mariabackup_backup.result
diff --git a/mysql-test/suite/galera_3nodes/t/galera_innobackupex_backup.cnf b/mysql-test/suite/galera_3nodes/t/galera_mariabackup_backup.cnf
index 35ecb8b5937..35ecb8b5937 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_innobackupex_backup.cnf
+++ b/mysql-test/suite/galera_3nodes/t/galera_mariabackup_backup.cnf
diff --git a/mysql-test/suite/galera_3nodes/t/galera_innobackupex_backup.test b/mysql-test/suite/galera_3nodes/t/galera_mariabackup_backup.test
index cd5c020ae38..a22d1f3f48c 100644
--- a/mysql-test/suite/galera_3nodes/t/galera_innobackupex_backup.test
+++ b/mysql-test/suite/galera_3nodes/t/galera_mariabackup_backup.test
@@ -23,9 +23,11 @@ INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
 --connection node_2
 SELECT COUNT(*) = 10 FROM t1;
 
---exec rm -rf $MYSQL_TMP_DIR/innobackupex_backup
---exec mariabackup --innobackupex --defaults-file=$MYSQLTEST_VARDIR/my.cnf --defaults-group=mysqld.2 --galera-info --port=$NODE_MYPORT_2 --host=127.0.0.1 --no-timestamp $MYSQL_TMP_DIR/innobackupex_backup &> $MYSQL_TMP_DIR/innobackupex-backup.log
---exec mariabackup --innobackupex --defaults-file=$MYSQLTEST_VARDIR/my.cnf --defaults-group=mysqld.2 --apply-log --galera-info --port=$NODE_MYPORT_2 --host=127.0.0.1 --no-timestamp $MYSQL_TMP_DIR/innobackupex_backup &> $MYSQL_TMP_DIR/innobackupex-apply.log
+--let BACKUP_DIR=$MYSQL_TMP_DIR/mariabackup_backup
+--let BACKUP_LOG_PREFFIX=$BACKUP_DIR
+--exec rm -rf $BACKUP_DIR
+--exec mariabackup --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --defaults-group=mysqld.2 --galera-info --port=$NODE_MYPORT_2 --host=127.0.0.1 --target-dir=$BACKUP_DIR &> $BACKUP_LOG_PREFFIX-backup.log
+--exec mariabackup --defaults-file=$MYSQLTEST_VARDIR/my.cnf --defaults-group=mysqld.2 --prepare --galera-info --port=$NODE_MYPORT_2 --host=127.0.0.1 --target-dir=$BACKUP_DIR &> $BACKUP_LOG_PREFFIX-apply.log
 
 --source ../galera/include/kill_galera.inc
 --sleep 1
@@ -34,7 +36,7 @@ SELECT COUNT(*) = 10 FROM t1;
 INSERT INTO t1 VALUES (11),(12),(13),(14),(15),(16),(17),(18),(19),(20);
 
 --exec rm -rf $MYSQLTEST_VARDIR/mysqld.2/data/*
---exec mariabackup --innobackupex --defaults-file=$MYSQLTEST_VARDIR/my.cnf --defaults-group=mysqld.2 --copy-back --port=$NODE_MYPORT_2 --host=127.0.0.1 $MYSQL_TMP_DIR/innobackupex_backup &> $MYSQL_TMP_DIR/innobackupex-restore.log
+--exec mariabackup --defaults-file=$MYSQLTEST_VARDIR/my.cnf --defaults-group=mysqld.2 --copy-back --port=$NODE_MYPORT_2 --host=127.0.0.1 --target-dir=$BACKUP_DIR &> $BACKUP_LOG_PREFFIX-restore.log
 
 #
 # Convert the xtrabackup_galera_info into a grastate.dat file
@@ -42,7 +44,7 @@ INSERT INTO t1 VALUES (11),(12),(13),(14),(15),(16),(17),(18),(19),(20);
 
 --perl
         use strict;
-        my $xtrabackup_galera_info_file = $ENV{'MYSQL_TMP_DIR'}.'/innobackupex_backup/xtrabackup_galera_info';
+        my $xtrabackup_galera_info_file = $ENV{'BACKUP_DIR'}.'/xtrabackup_galera_info';
         open(XTRABACKUP_GALERA_INFO, $xtrabackup_galera_info_file) or die "Can not open $xtrabackup_galera_info_file: $!";
         my $xtrabackup_galera_info = <XTRABACKUP_GALERA_INFO>;
         my ($uuid, $seqno) = split(':', $xtrabackup_galera_info);
diff --git a/mysql-test/suite/mariabackup/xb_compressed_encrypted.test b/mysql-test/suite/mariabackup/xb_compressed_encrypted.test
index 2cca740d7dd..a2b9d41ed81 100644
--- a/mysql-test/suite/mariabackup/xb_compressed_encrypted.test
+++ b/mysql-test/suite/mariabackup/xb_compressed_encrypted.test
@@ -20,9 +20,9 @@ COMMIT;
 echo # xtrabackup backup;
 --disable_result_log
 let $targetdir=$MYSQLTEST_VARDIR/tmp/backup;
-exec $INNOBACKUPEX --defaults-file=$MYSQLTEST_VARDIR/my.cnf --no-timestamp $targetdir;
+exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$targetdir;
 drop table t1;
-exec $INNOBACKUPEX --apply-log $targetdir;
+exec $XTRABACKUP --prepare --target-dir=$targetdir;
 
 -- source include/restart_and_restore.inc
 --enable_result_log
diff --git a/mysql-test/suite/mariabackup/xb_fulltext_encrypted.test b/mysql-test/suite/mariabackup/xb_fulltext_encrypted.test
index f7b72b5ccea..1ef17d5382e 100644
--- a/mysql-test/suite/mariabackup/xb_fulltext_encrypted.test
+++ b/mysql-test/suite/mariabackup/xb_fulltext_encrypted.test
@@ -15,8 +15,9 @@ let $targetdir=$MYSQLTEST_VARDIR/tmp/backup;
 
 --disable_result_log
 
-exec $INNOBACKUPEX --defaults-file=$MYSQLTEST_VARDIR/my.cnf --no-timestamp $targetdir;
-exec $INNOBACKUPEX --apply-log $targetdir;
+exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$targetdir;
+exec $XTRABACKUP --prepare --target-dir=$targetdir;
+
 --source include/restart_and_restore.inc
 
 --enable_result_log
diff --git a/mysql-test/suite/mariabackup/xb_partition.test b/mysql-test/suite/mariabackup/xb_partition.test
index 3d027b67fc1..1bfafd30149 100644
--- a/mysql-test/suite/mariabackup/xb_partition.test
+++ b/mysql-test/suite/mariabackup/xb_partition.test
@@ -68,9 +68,9 @@ ALTER TABLE isam_p ADD PARTITION (PARTITION p5 VALUES LESS THAN (600));
 INSERT INTO isam_p VALUES (401), (501);
 
 --disable_result_log
-exec $INNOBACKUPEX --defaults-file=$MYSQLTEST_VARDIR/my.cnf --incremental --no-timestamp --incremental-basedir=$targetdir/full $targetdir/inc;
-exec $INNOBACKUPEX --defaults-file=$MYSQLTEST_VARDIR/my.cnf --apply-log $targetdir/full;
-exec $INNOBACKUPEX --defaults-file=$MYSQLTEST_VARDIR/my.cnf --apply-log --incremental-dir=$targetdir/inc $targetdir/full;
+exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --incremental-basedir=$targetdir/full --target-dir=$targetdir/inc;
+exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --prepare --target-dir=$targetdir/full;
+exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --prepare --incremental-dir=$targetdir/inc --target-dir=$targetdir/full;
 
 let $targetdir=$targetdir/full;
 -- source include/restart_and_restore.inc