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

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