database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Bjorn Munch
2010-02-16 20:49:21 +01:00
parent cec8a9380b
commit 459024e01f
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/include/mtr_warnings.sql
View File

@ -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