diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-07 22:53:21 +0000 |
---|---|---|
committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-07 22:54:06 +0000 |
commit | d471469bd2a6de0d8d68343bcf374a382c5bfd92 (patch) | |
tree | 9bc25756deaf134cb07c11c0a8ebdf6f43a09ea5 /mysql-test | |
parent | d26fb96a9f225e53941fad5feb21abddbbf99a95 (diff) | |
download | mariadb-git-d471469bd2a6de0d8d68343bcf374a382c5bfd92.tar.gz |
MDEV-13466 Implement --export option for MariaDB Backup
full server recovery is performed .
We start "mysqld" with --bootstrap
and pass bootstrap script consisting of several FLUSH TABLES FOR export/
UNLOCK TABLES
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/suite/mariabackup/disabled.def | 3 | ||||
-rw-r--r-- | mysql-test/suite/mariabackup/partial.result | 6 | ||||
-rw-r--r-- | mysql-test/suite/mariabackup/partial.test | 18 | ||||
-rw-r--r-- | mysql-test/suite/mariabackup/xb_page_compress.test | 2 |
4 files changed, 24 insertions, 5 deletions
diff --git a/mysql-test/suite/mariabackup/disabled.def b/mysql-test/suite/mariabackup/disabled.def index d3c11872f0a..8b137891791 100644 --- a/mysql-test/suite/mariabackup/disabled.def +++ b/mysql-test/suite/mariabackup/disabled.def @@ -1,2 +1 @@ -partial : xtrabackup --export does not work -xb_page_compress : xtrabackup --export does not work + diff --git a/mysql-test/suite/mariabackup/partial.result b/mysql-test/suite/mariabackup/partial.result index 98c59be91bb..8ccc8f6a6c7 100644 --- a/mysql-test/suite/mariabackup/partial.result +++ b/mysql-test/suite/mariabackup/partial.result @@ -1,9 +1,14 @@ CREATE TABLE t1(i INT) ENGINE INNODB; INSERT INTO t1 VALUES(1); +CREATE TABLE t21(i INT) ENGINE INNODB; +INSERT INTO t21 VALUES(1); CREATE TABLE t2(i int) ENGINE INNODB; # xtrabackup backup t1.ibd +t21.ibd # xtrabackup prepare +t1.cfg +t21.cfg ALTER TABLE t1 DISCARD TABLESPACE; ALTER TABLE t1 IMPORT TABLESPACE; SELECT * FROM t1; @@ -11,3 +16,4 @@ i 1 DROP TABLE t1; DROP TABLE t2; +DROP TABLE t21; diff --git a/mysql-test/suite/mariabackup/partial.test b/mysql-test/suite/mariabackup/partial.test index 9c774b2df03..559ba155972 100644 --- a/mysql-test/suite/mariabackup/partial.test +++ b/mysql-test/suite/mariabackup/partial.test @@ -5,6 +5,9 @@ CREATE TABLE t1(i INT) ENGINE INNODB; INSERT INTO t1 VALUES(1); +CREATE TABLE t21(i INT) ENGINE INNODB; +INSERT INTO t21 VALUES(1); + CREATE TABLE t2(i int) ENGINE INNODB; echo # xtrabackup backup; @@ -15,13 +18,23 @@ exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup "--tables=te --enable_result_log list_files $targetdir/test *.ibd; +# Inject a junk .ibd file into backup dir to +# see if prepare does not choke on it. +write_file $targetdir/test/junk.ibd; +EOF +write_file $targetdir/test/junk.frm; +EOF + + echo # xtrabackup prepare; --disable_result_log -exec $XTRABACKUP --prepare --export --target-dir=$targetdir; +exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --defaults-group-suffix=.1 --prepare --export --target-dir=$targetdir; --enable_result_log -ALTER TABLE t1 DISCARD TABLESPACE; +list_files $targetdir/test *.cfg; + let $MYSQLD_DATADIR= `select @@datadir`; +ALTER TABLE t1 DISCARD TABLESPACE; copy_file $targetdir/test/t1.ibd $MYSQLD_DATADIR/test/t1.ibd; copy_file $targetdir/test/t1.cfg $MYSQLD_DATADIR/test/t1.cfg; ALTER TABLE t1 IMPORT TABLESPACE; @@ -29,4 +42,5 @@ ALTER TABLE t1 IMPORT TABLESPACE; SELECT * FROM t1; DROP TABLE t1; DROP TABLE t2; +DROP TABLE t21; rmdir $targetdir; diff --git a/mysql-test/suite/mariabackup/xb_page_compress.test b/mysql-test/suite/mariabackup/xb_page_compress.test index 0e9a7d6987c..7e806e6de22 100644 --- a/mysql-test/suite/mariabackup/xb_page_compress.test +++ b/mysql-test/suite/mariabackup/xb_page_compress.test @@ -29,7 +29,7 @@ let $targetdir=$MYSQLTEST_VARDIR/tmp/backup; --disable_result_log exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup "--tables=test.*1" --target-dir=$targetdir; echo # xtrabackup prepare; -exec $XTRABACKUP --prepare --export --target-dir=$targetdir; +exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --defaults-group-suffix=.1 --prepare --export --target-dir=$targetdir; --enable_result_log ALTER TABLE t1 DISCARD TABLESPACE; |