diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-15 10:17:15 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-15 10:17:15 +0300 |
commit | 9936cfd531a49b0ba124c4eb38a6099ec420c7fd (patch) | |
tree | 52e3c6dd19846b7ff0d895c31e78bc1e781ca780 /mysql-test/suite/mariabackup | |
parent | a7634281aa64a549d19cd20ead7e80d0267271ee (diff) | |
parent | 8a0944080c950349aaf7c81bc8f8c63b262f98eb (diff) | |
download | mariadb-git-9936cfd531a49b0ba124c4eb38a6099ec420c7fd.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/suite/mariabackup')
-rw-r--r-- | mysql-test/suite/mariabackup/huge_lsn.result | 4 | ||||
-rw-r--r-- | mysql-test/suite/mariabackup/huge_lsn.test | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/suite/mariabackup/huge_lsn.result b/mysql-test/suite/mariabackup/huge_lsn.result index 82d743bbad4..1af19ef3cf8 100644 --- a/mysql-test/suite/mariabackup/huge_lsn.result +++ b/mysql-test/suite/mariabackup/huge_lsn.result @@ -17,3 +17,7 @@ SELECT * FROM t; i 1 DROP TABLE t; +# shutdown server +# remove datadir +# xtrabackup move back +# restart diff --git a/mysql-test/suite/mariabackup/huge_lsn.test b/mysql-test/suite/mariabackup/huge_lsn.test index d41bb61a096..055c92f9a55 100644 --- a/mysql-test/suite/mariabackup/huge_lsn.test +++ b/mysql-test/suite/mariabackup/huge_lsn.test @@ -8,6 +8,10 @@ let INNODB_PAGE_SIZE=`select @@innodb_page_size`; let MYSQLD_DATADIR=`select @@datadir`; +let $targetdir_old=$MYSQLTEST_VARDIR/tmp/backup_1; +--disable_result_log +exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$targetdir_old; +--enable_result_log --source include/shutdown_mysqld.inc perl; @@ -56,3 +60,7 @@ exec $XTRABACKUP --prepare --target-dir=$targetdir; SELECT * FROM t; DROP TABLE t; rmdir $targetdir; +let $targetdir= $targetdir_old; +exec $XTRABACKUP --prepare --target-dir=$targetdir; +--source include/restart_and_restore.inc +rmdir $targetdir_old; |