From c0db3fe6dabd2cb0df9bf532f54f9e8d233fa499 Mon Sep 17 00:00:00 2001 From: Simon Lipp Date: Mon, 27 May 2019 13:52:27 +0200 Subject: MDEV-18438 Don't stream xtrabackup_info of extra-lsndir --- mysql-test/suite/mariabackup/extra_lsndir_stream.result | 2 ++ mysql-test/suite/mariabackup/extra_lsndir_stream.test | 7 +++++++ mysql-test/suite/mariabackup/mdev-18438.result | 1 + mysql-test/suite/mariabackup/mdev-18438.test | 11 +++++++++++ 4 files changed, 21 insertions(+) create mode 100644 mysql-test/suite/mariabackup/extra_lsndir_stream.result create mode 100644 mysql-test/suite/mariabackup/extra_lsndir_stream.test create mode 100644 mysql-test/suite/mariabackup/mdev-18438.result create mode 100644 mysql-test/suite/mariabackup/mdev-18438.test (limited to 'mysql-test/suite/mariabackup') diff --git a/mysql-test/suite/mariabackup/extra_lsndir_stream.result b/mysql-test/suite/mariabackup/extra_lsndir_stream.result new file mode 100644 index 00000000000..a25c45a13d1 --- /dev/null +++ b/mysql-test/suite/mariabackup/extra_lsndir_stream.result @@ -0,0 +1,2 @@ +xtrabackup_checkpoints +xtrabackup_info diff --git a/mysql-test/suite/mariabackup/extra_lsndir_stream.test b/mysql-test/suite/mariabackup/extra_lsndir_stream.test new file mode 100644 index 00000000000..97023cb179d --- /dev/null +++ b/mysql-test/suite/mariabackup/extra_lsndir_stream.test @@ -0,0 +1,7 @@ +let $extra_lsndir=$MYSQLTEST_VARDIR/tmp/extra_lsndir; +mkdir $extra_lsndir; +--disable_result_log +exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --stream=xbstream --extra-lsndir=$extra_lsndir > /dev/null; +--enable_result_log +list_files $extra_lsndir; +rmdir $extra_lsndir; diff --git a/mysql-test/suite/mariabackup/mdev-18438.result b/mysql-test/suite/mariabackup/mdev-18438.result new file mode 100644 index 00000000000..ab3b81bd484 --- /dev/null +++ b/mysql-test/suite/mariabackup/mdev-18438.result @@ -0,0 +1 @@ +stream.xb diff --git a/mysql-test/suite/mariabackup/mdev-18438.test b/mysql-test/suite/mariabackup/mdev-18438.test new file mode 100644 index 00000000000..a6ec45476ff --- /dev/null +++ b/mysql-test/suite/mariabackup/mdev-18438.test @@ -0,0 +1,11 @@ +let $basedir=$MYSQLTEST_VARDIR/tmp/mdev-18438; +mkdir $basedir; +exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --extra-lsndir=$basedir/extra_lsndir --stream=xbstream > $basedir/stream.xb; +mkdir $basedir/backup; +rmdir $basedir/extra_lsndir; +--disable_result_log +exec $XBSTREAM -x -C $basedir/backup < $basedir/stream.xb; +--enable_result_log +rmdir $basedir/backup; +list_files $basedir; +rmdir $basedir; -- cgit v1.2.1