diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-10 17:30:15 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-10 17:30:15 +0200 |
commit | da21f3f42837b968e6c46b11a8597bbec5f0492f (patch) | |
tree | b56dd0bae31885a1669e21b8fb1f192cc0bcf6b8 /mysql-test/suite/maria | |
parent | fef9d6ef1db9a4648a54954c38ea4fbab2a6542c (diff) | |
parent | 7ee612c912eb3b9ebf8ce3ec8b2157144cfe804b (diff) | |
download | mariadb-git-da21f3f42837b968e6c46b11a8597bbec5f0492f.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/suite/maria')
-rw-r--r-- | mysql-test/suite/maria/rollback.result | 1 | ||||
-rw-r--r-- | mysql-test/suite/maria/rollback.test | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite/maria/rollback.result b/mysql-test/suite/maria/rollback.result index 959f596edf2..2e58387ce57 100644 --- a/mysql-test/suite/maria/rollback.result +++ b/mysql-test/suite/maria/rollback.result @@ -1,3 +1,4 @@ +reset master; call mtr.add_suppression("Table was marked as crashed"); call mtr.add_suppression("Checking table: .*"); create table t1 (a int primary key auto_increment, b int) engine=aria transactional= 1; diff --git a/mysql-test/suite/maria/rollback.test b/mysql-test/suite/maria/rollback.test index 1469c26eaa2..d42be9274e6 100644 --- a/mysql-test/suite/maria/rollback.test +++ b/mysql-test/suite/maria/rollback.test @@ -3,6 +3,8 @@ # no-protocol doesn't print warnings about repaired tables --source include/no_protocol.inc +reset master; # clear binlogs + call mtr.add_suppression("Table was marked as crashed"); call mtr.add_suppression("Checking table: .*"); |