Skip to content

M
MariaDB
Commit 53411abc authored by Bjorn Munch's avatar Bjorn Munch
Browse files
Options

fixed wrong merge conflict in mysql-test/include/mtr_warnings.sql

parent 663ffc57
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
mysql-test/include/mtr_warnings.sql
View file @ 53411abc
...@@ -215,6 +215,7 @@ INSERT INTO global_suppressions VALUES ...@@ -215,6 +215,7 @@ INSERT INTO global_suppressions VALUES
("Slave I/O: Get master clock failed with error:.*"), ("Slave I/O: Get master clock failed with error:.*"),
("Slave I/O: Get master COLLATION_SERVER failed with error:.*"), ("Slave I/O: Get master COLLATION_SERVER failed with error:.*"),
("Slave I/O: Get master TIME_ZONE failed with error:.*"), ("Slave I/O: Get master TIME_ZONE failed with error:.*"),
/*
BUG#42147 - Concurrent DML and LOCK TABLE ... READ for InnoDB BUG#42147 - Concurrent DML and LOCK TABLE ... READ for InnoDB
table cause warnings in errlog table cause warnings in errlog
Note: This is a temporary suppression until Bug#42147 can be Note: This is a temporary suppression until Bug#42147 can be
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7