diff options
| author | Alexander Barkov <bar@mariadb.org> | 2018-02-08 19:06:25 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2018-02-08 19:06:25 +0400 |
| commit | 3cad31f2a758f797ef0acac5625d0e007ecbce93 (patch) | |
| tree | 73c054636c4858b2a51eddf7eaa653746d67524e /mysql-test/suite/mariabackup/apply-log-only-incr.result | |
| parent | 560b9895d413bdfedda0a0ca871a635858990c05 (diff) | |
| parent | 5c057b3fef3aa92cfadbd63043799b430132a494 (diff) | |
| download | mariadb-git-3cad31f2a758f797ef0acac5625d0e007ecbce93.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'mysql-test/suite/mariabackup/apply-log-only-incr.result')
| -rw-r--r-- | mysql-test/suite/mariabackup/apply-log-only-incr.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/mariabackup/apply-log-only-incr.result b/mysql-test/suite/mariabackup/apply-log-only-incr.result index 114a471aa2c..917a9647511 100644 --- a/mysql-test/suite/mariabackup/apply-log-only-incr.result +++ b/mysql-test/suite/mariabackup/apply-log-only-incr.result @@ -10,9 +10,9 @@ SET GLOBAL innodb_flush_log_at_trx_commit = 1; ROLLBACK; disconnect flush_log; connection default; -NOT FOUND /Rollback of trx with id/ in current_test +NOT FOUND /Rolled back recovered transaction/ in current_test # expect NOT FOUND -NOT FOUND /Rollback of trx with id/ in current_test +NOT FOUND /Rolled back recovered transaction/ in current_test # expect NOT FOUND commit; SELECT count(*) FROM t; |