diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-31 12:01:35 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-31 12:06:46 +0200 |
| commit | 67d89e4d7deb85fa11a18432a207eb59da6d600d (patch) | |
| tree | 80cf9bfcd83f5267b80c5a682aca33572ff3402d /mysql-test/suite/mariabackup/apply-log-only.test | |
| parent | f5f56a076b6ea45ea39c47f418846168c192fbd0 (diff) | |
| download | mariadb-git-67d89e4d7deb85fa11a18432a207eb59da6d600d.tar.gz | |
MDEV-15143 InnoDB: Rollback of trx with id 0 completed
When InnoDB has completed the rollback of a recovered transaction,
it used to display the transaction identifier.
This was broken in MySQL 5.7.2 in
https://github.com/mysql/mysql-server/commit/2f5f3cd3ac46d46c7635e778b338f63b5521cd46
which was merged to MariaDB 10.2.2 in
commit 2e814d4702d71a04388386a9f591d14a35980bfe.
trx_rollback_active(): Cache the transaction ID before it will be
reset by transaction commit. Do not display the message if the
rollback was interrupted by shutdown (MDEV-13797, MDEV-12352).
Diffstat (limited to 'mysql-test/suite/mariabackup/apply-log-only.test')
| -rw-r--r-- | mysql-test/suite/mariabackup/apply-log-only.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/mariabackup/apply-log-only.test b/mysql-test/suite/mariabackup/apply-log-only.test index 96a251fc03b..5a3c45f2914 100644 --- a/mysql-test/suite/mariabackup/apply-log-only.test +++ b/mysql-test/suite/mariabackup/apply-log-only.test @@ -14,7 +14,7 @@ exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir exec $XTRABACKUP --prepare --apply-log-only --target-dir=$basedir ; let SEARCH_FILE=$MYSQLTEST_VARDIR/log/current_test; ---let SEARCH_PATTERN= Rollback of trx with id +--let SEARCH_PATTERN= Rolled back recovered transaction --source include/search_pattern_in_file.inc --echo # expect NOT FOUND |