database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Bug #36968 rpl_temporary_errors.test produces warning in pushbuild

Browse Source 
Backporting fixes to 5.1 from 6.0.

mysql-test/include/mtr_warnings.sql:
  removing the global rule for deadlock, use per-test intead.
mysql-test/suite/rpl/r/rpl_temporary_errors.result:
  deploying the expected deadlock error suppression in the test.
mysql-test/suite/rpl/t/rpl_temporary_errors.test:
  deploying the expected deadlock error suppression in the test.
This commit is contained in:
Andrei Elkin
2008-08-25 15:40:44 +03:00
parent 8b637b2847
commit b7f04d0c6c
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,7 +134,6 @@ INSERT INTO global_supressions VALUES
("Slave: According to the master's version"), ("Slave: According to the master's version"),
("Slave: Column [0-9]* type mismatch"), ("Slave: Column [0-9]* type mismatch"),
("Slave: Error .* doesn't exist"), ("Slave: Error .* doesn't exist"),
("Slave: Error .*Deadlock found"),
("Slave: Error .*Unknown table"), ("Slave: Error .*Unknown table"),
("Slave: Error in Write_rows event: "), ("Slave: Error in Write_rows event: "),
("Slave: Field .* of table .* has no default value"), ("Slave: Field .* of table .* has no default value"),

1
mysql-test/suite/rpl/r/rpl_temporary_errors.result
View File

@ -4,6 +4,7 @@ reset master;
reset slave; reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
call mtr.add_supression("Deadlock found");
**** On Master **** **** On Master ****
SET SESSION BINLOG_FORMAT=ROW; SET SESSION BINLOG_FORMAT=ROW;
CREATE TABLE t1 (a INT PRIMARY KEY, b INT); CREATE TABLE t1 (a INT PRIMARY KEY, b INT);

2
mysql-test/suite/rpl/t/rpl_temporary_errors.test
View File

@ -1,5 +1,7 @@
source include/master-slave.inc; source include/master-slave.inc;
call mtr.add_supression("Deadlock found");
--echo **** On Master **** --echo **** On Master ****
connection master; connection master;
SET SESSION BINLOG_FORMAT=ROW; SET SESSION BINLOG_FORMAT=ROW;