diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-06 09:01:24 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-06 09:07:52 +0300 |
| commit | e3207b6c132666e734adcd6e4c8485b1580039c4 (patch) | |
| tree | 2e9ba246a67919201cbca48d9401ca9173087bb2 | |
| parent | e9b78a1055c2b21fac1fc43dc8d660778d493fa6 (diff) | |
| download | mariadb-git-e3207b6c132666e734adcd6e4c8485b1580039c4.tar.gz | |
MDEV-14188 mariabackup.incremental_encrypted wrong result
Add an explicit redo log flush. In this test
innodb_flush_log_at_trx_commit was 2 by default.
It is also possible that this failure occurs because of MDEV-15740.
| -rw-r--r-- | mysql-test/suite/mariabackup/incremental_encrypted.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/mariabackup/incremental_encrypted.test | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/mariabackup/incremental_encrypted.result b/mysql-test/suite/mariabackup/incremental_encrypted.result index e8f81e9fa49..e9525c9c4b7 100644 --- a/mysql-test/suite/mariabackup/incremental_encrypted.result +++ b/mysql-test/suite/mariabackup/incremental_encrypted.result @@ -2,6 +2,7 @@ call mtr.add_suppression("InnoDB: New log files created"); CREATE TABLE t(i INT) ENGINE INNODB ENCRYPTED=YES; INSERT INTO t VALUES(1); # Create full backup , modify table, then create incremental/differential backup +SET GLOBAL innodb_flush_log_at_trx_commit = 1; INSERT INTO t VALUES(2); SELECT * FROM t; i diff --git a/mysql-test/suite/mariabackup/incremental_encrypted.test b/mysql-test/suite/mariabackup/incremental_encrypted.test index 8bcada493c6..e618ac4f79e 100644 --- a/mysql-test/suite/mariabackup/incremental_encrypted.test +++ b/mysql-test/suite/mariabackup/incremental_encrypted.test @@ -20,6 +20,7 @@ echo # Create full backup , modify table, then create incremental/differential b exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$basedir; --enable_result_log +SET GLOBAL innodb_flush_log_at_trx_commit = 1; INSERT INTO t VALUES(2); SELECT * FROM t; |