From 459024e01f5fb5ba1edbaf105a2ee2e97fe7c463 Mon Sep 17 00:00:00 2001 From: Bjorn Munch Date: Tue, 16 Feb 2010 20:49:21 +0100 Subject: [PATCH] fixed wrong merge conflict in mysql-test/include/mtr_warnings.sql --- mysql-test/include/mtr_warnings.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index 940d0b7b34e..9378329353b 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -215,6 +215,7 @@ INSERT INTO global_suppressions VALUES ("Slave I/O: Get master clock failed with error:.*"), ("Slave I/O: Get master COLLATION_SERVER failed with error:.*"), ("Slave I/O: Get master TIME_ZONE failed with error:.*"), + /* BUG#42147 - Concurrent DML and LOCK TABLE ... READ for InnoDB table cause warnings in errlog Note: This is a temporary suppression until Bug#42147 can be