diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2023-04-27 21:18:33 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2023-04-27 23:12:18 +0300 |
| commit | c490564689c6d976ad1a5e87263f72ab7944f091 (patch) | |
| tree | d6fab76276f227adf8b8ea8853c1df5b3e6357ce | |
| parent | eba6a95ddd8efd4ac797f43581841bd0d7cd77a2 (diff) | |
| download | mariadb-git-bb-10.4-midenok-MDEV-31042.tar.gz | |
| -rw-r--r-- | mysql-test/suite/mariabackup/MDEV-31042_1.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/mariabackup/MDEV-31042_1.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/mariabackup/MDEV-31042_2.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/mariabackup/MDEV-31042_2.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/mariabackup/MDEV-31042_3.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/mariabackup/MDEV-31042_3.test | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/suite/mariabackup/MDEV-31042_1.result b/mysql-test/suite/mariabackup/MDEV-31042_1.result index 8b29c514ceb..f43bc989791 100644 --- a/mysql-test/suite/mariabackup/MDEV-31042_1.result +++ b/mysql-test/suite/mariabackup/MDEV-31042_1.result @@ -13,7 +13,7 @@ RENAME TABLE t1 TO z_tmp_u1332929658s, tmp_u1332929658s TO t1; # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart create database ztest; RENAME TABLE test.z_tmp_u1332929658s TO ztest.z_tmp_u1332929658s; select count(*) from ztest.z_tmp_u1332929658s; diff --git a/mysql-test/suite/mariabackup/MDEV-31042_1.test b/mysql-test/suite/mariabackup/MDEV-31042_1.test index 235915e55cc..86e5a8a7719 100644 --- a/mysql-test/suite/mariabackup/MDEV-31042_1.test +++ b/mysql-test/suite/mariabackup/MDEV-31042_1.test @@ -33,7 +33,7 @@ exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir= #--disable_result_log #echo # Prepare full backup, apply incremental one; -exec $XTRABACKUP --apply-log-only --prepare --target-dir=$basedir; +exec $XTRABACKUP --prepare --target-dir=$basedir; exec $XTRABACKUP --prepare --target-dir=$basedir --incremental-dir=$incremental_dir ; #echo # Restore and check results; diff --git a/mysql-test/suite/mariabackup/MDEV-31042_2.result b/mysql-test/suite/mariabackup/MDEV-31042_2.result index 4be83632d05..a256b13c48b 100644 --- a/mysql-test/suite/mariabackup/MDEV-31042_2.result +++ b/mysql-test/suite/mariabackup/MDEV-31042_2.result @@ -14,7 +14,7 @@ RENAME TABLE t1 TO z_tmp_u1332929658s, tmp_u1332929658s TO t1; # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart create database ztest; RENAME TABLE test.z_tmp_u1332929658s TO ztest.z_tmp_u1332929658s; select count(*) from ztest.z_tmp_u1332929658s; diff --git a/mysql-test/suite/mariabackup/MDEV-31042_2.test b/mysql-test/suite/mariabackup/MDEV-31042_2.test index 9b80b0f1f9e..819f910e658 100644 --- a/mysql-test/suite/mariabackup/MDEV-31042_2.test +++ b/mysql-test/suite/mariabackup/MDEV-31042_2.test @@ -33,7 +33,7 @@ exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir= #--disable_result_log #echo # Prepare full backup, apply incremental one; -exec $XTRABACKUP --apply-log-only --prepare --target-dir=$basedir; +exec $XTRABACKUP --prepare --target-dir=$basedir; exec $XTRABACKUP --prepare --target-dir=$basedir --incremental-dir=$incremental_dir ; #echo # Restore and check results; diff --git a/mysql-test/suite/mariabackup/MDEV-31042_3.result b/mysql-test/suite/mariabackup/MDEV-31042_3.result index 61b4c697e06..e1ffc44d63d 100644 --- a/mysql-test/suite/mariabackup/MDEV-31042_3.result +++ b/mysql-test/suite/mariabackup/MDEV-31042_3.result @@ -11,7 +11,7 @@ INSERT INTO t1 VALUES (1,24596,4,'hJWXmQdfsdf=='); # shutdown server # remove datadir # xtrabackup move back -# restart server +# restart db.opt t1.frm t1.ibd diff --git a/mysql-test/suite/mariabackup/MDEV-31042_3.test b/mysql-test/suite/mariabackup/MDEV-31042_3.test index 95089afdf1c..54d97fa29d8 100644 --- a/mysql-test/suite/mariabackup/MDEV-31042_3.test +++ b/mysql-test/suite/mariabackup/MDEV-31042_3.test @@ -30,7 +30,7 @@ exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir= #--disable_result_log #echo # Prepare full backup, apply incremental one; -exec $XTRABACKUP --apply-log-only --prepare --target-dir=$basedir; +exec $XTRABACKUP --prepare --target-dir=$basedir; exec $XTRABACKUP --prepare --target-dir=$basedir --incremental-dir=$incremental_dir ; #echo # Restore and check results; |