Skip to content

Commit 1f9d8cd

Browse files
bjornmubjornmu
committed
Bug #11762407 54999: MTR GLOBAL SUPPRESSION HIDES SQL THREAD EXECUTION UNEXPECTED ERRORS
Removed the global suppression, added lots of local ones to affected tests Re-commit, now kept "Slave SQL" at start of patterns.
1 parent e9c07c5 commit 1f9d8cd

File tree

66 files changed

+122
-11
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+122
-11
lines changed

‎mysql-test/extra/binlog_tests/binlog.test

+1
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ SHOW SESSION VARIABLES LIKE "%_checks";
343343
--echo # INSERT INTO t1 VALUES(2)
344344
--echo # foreign_key_checks=1 and unique_checks=1
345345
--echo # It should not change current session's variables, even error happens
346+
call mtr.add_suppression("Slave SQL.*Could not execute Write_rows event on table test.t1; Duplicate entry .2. for key .PRIMARY., Error_code: 1062");
346347
--error 1062
347348
BINLOG '
348349
dfLtTBMBAAAAKQAAAKsBAAAAABcAAAAAAAEABHRlc3QAAnQxAAEDAAE=

‎mysql-test/extra/rpl_tests/rpl_conflicts.test

+2
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ if (`SELECT @@global.binlog_format != 'ROW' OR @@global.slave_exec_mode = 'STRIC
9393
source include/wait_for_slave_sql_error.inc;
9494
let $err= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1);
9595
--echo Last_SQL_Error = $err (expected "duplicate key" error)
96+
call mtr.add_suppression("Slave SQL.*Duplicate entry .1. for key .PRIMARY.* Error_code: 1062");
9697
SELECT * FROM t1;
9798

9899
--echo ---- Resolve the conflict on the slave and restart SQL thread ----
@@ -137,6 +138,7 @@ connection slave;
137138
# replication continues.
138139
if (`SELECT @@global.binlog_format = 'ROW' AND @@global.slave_exec_mode = 'STRICT'`) {
139140
--echo ---- Wait until slave stops with an error ----
141+
call mtr.add_suppression("Can.t find record in .t1., Error_code: 1032");
140142
let $slave_sql_errno= 1032; # ER_KEY_NOT_FOUND
141143
source include/wait_for_slave_sql_error.inc;
142144

‎mysql-test/extra/rpl_tests/rpl_extra_col_master.test

+6
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,12 @@ SELECT f1,f2,f3,f4,f5,f6,f7,f8,f9,
121121
hex(f10),hex(f11) FROM t1 ORDER BY f3 LIMIT 20;
122122

123123
#connection slave;
124+
125+
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535");
126+
call mtr.add_suppression("Slave SQL.*Error .Can.t DROP .c7.; check that column.key exists. on query.* 1091");
127+
call mtr.add_suppression("Slave SQL.*Error .Unknown column .c7. in .t15.. on query.* 1054");
128+
call mtr.add_suppression("Slave SQL.*Error .Key column .c6. doesn.t exist in table. on query.* 1072");
129+
124130
sync_slave_with_master;
125131
--echo
126132
--echo * Select count and 20 rows from Slave *

‎mysql-test/extra/rpl_tests/rpl_extra_col_slave.test

+4
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,10 @@ RESET MASTER;
766766
connection slave;
767767
START SLAVE;
768768

769+
call mtr.add_suppression("Slave SQL.*Error .Unknown table .t6.. on query.* Error_code: 1051");
770+
call mtr.add_suppression("Slave SQL.*Error .Duplicate column name .c6.. on query.* Error_code: 1060");
771+
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column . ...e mismatch.* Error_code: 1535");
772+
769773
--echo *** Master Data Insert ***
770774
connection master;
771775
set @b1 = 'b1b1b1b1';

‎mysql-test/extra/rpl_tests/rpl_loaddata.test

+2
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ eval $lower_stmt_head infile '../../std_data/rpl_loaddata.dat' into table t1;
6363
save_master_pos;
6464
connection slave;
6565
# 1062 = ER_DUP_ENTRY
66+
call mtr.add_suppression("Slave SQL.*Error .Duplicate entry .10. for key .b.. on query.* Error_code: 1062");
67+
call mtr.add_suppression("Slave SQL.*Query caused different errors on master and slave.*Error on master:.*error code=1062.*Error on slave:.*Error_code: 0");
6668
--let $slave_sql_errno= 1062
6769
--source include/wait_for_slave_sql_error_and_skip.inc
6870

‎mysql-test/extra/rpl_tests/rpl_row_basic.test

+3-1
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,9 @@ INSERT INTO t3 VALUES (1, "", 1);
371371
INSERT INTO t3 VALUES (2, repeat(_utf8'a', 128), 2);
372372

373373
connection slave;
374-
# 1535 = ER_BINLOG_ROW_WRONG_TABLE_DEF
374+
# 1535 = ER_BINLOG_ROW_WRONG_TABLE_DEF
375+
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
376+
call mtr.add_suppression("Slave SQL.*Could not execute Delete_rows event on table test.t1.* Error_code: 1032");
375377
--let $slave_sql_errno= 1535
376378
--let $show_slave_sql_error= 1
377379
--source include/wait_for_slave_sql_error.inc

‎mysql-test/extra/rpl_tests/rpl_row_tabledefs.test

+1
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ sync_slave_with_master;
147147
connection master;
148148
INSERT INTO t4 VALUES (4);
149149
connection slave;
150+
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column [012] type mismatch.* Error_code: 1535");
150151
--let $slave_skip_counter= 2
151152
--let $slave_sql_errno= 1535
152153
--let $show_slave_sql_error= 1

‎mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ drop table t1;
2525

2626
connection slave;
2727
--source include/wait_for_slave_sql_to_stop.inc
28+
call mtr.add_suppression("Slave SQL.*Query caused different errors on master and slave.*Error on master:.* error code=1062.*Error on slave:.* Error_code: 0");
2829
let $error= query_get_value(SHOW SLAVE STATUS, Last_SQL_Error, 1);
2930
let $errno= query_get_value(SHOW SLAVE STATUS, Last_SQL_Errno, 1);
3031
--echo Error: "$error" (expected different error codes on master and slave)

‎mysql-test/include/mtr_warnings.sql

-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ INSERT INTO global_suppressions VALUES
107107
("Slave: The incident LOST_EVENTS occured on the master"),
108108
("Slave: Unknown error.* 1105"),
109109
("Slave: Can't drop database.* database doesn't exist"),
110-
("Slave SQL:.*(Error_code: \[\[:digit:\]\]+|Query:.*)"),
111110
("Sort aborted"),
112111
("Time-out in NDB"),
113112
("Warning:\s+One can only use the --user.*root"),

‎mysql-test/suite/binlog/r/binlog_base64_flag.result

+2
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ iONkSBcBAAAAKwAAAMQBAAAQABAAAAAAAAEAA//4AQAAAAMAMTIzAQAAAA==
9191
';
9292
ERROR HY000: master may suffer from http://bugs.mysql.com/bug.php?id=37426 so slave stops; check error log on slave for more info
9393
drop table t1, char63_utf8, char128_utf8;
94+
call mtr.add_suppression("Slave SQL.*master suffers from this bug: http:..bugs.mysql.com.bug.php.id=37426.* Error_code: 1105");
95+
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
9496
#
9597
# Bug #54393: crash and/or valgrind errors in
9698
# mysql_client_binlog_statement

‎mysql-test/suite/binlog/r/binlog_row_binlog.result

+1
Original file line numberDiff line numberDiff line change
@@ -1374,6 +1374,7 @@ unique_checks OFF
13741374
# INSERT INTO t1 VALUES(2)
13751375
# foreign_key_checks=1 and unique_checks=1
13761376
# It should not change current session's variables, even error happens
1377+
call mtr.add_suppression("Slave SQL.*Could not execute Write_rows event on table test.t1; Duplicate entry .2. for key .PRIMARY., Error_code: 1062");
13771378
BINLOG '
13781379
dfLtTBMBAAAAKQAAAKsBAAAAABcAAAAAAAEABHRlc3QAAnQxAAEDAAE=
13791380
dfLtTBcBAAAAIgAAAM0BAAAAABcAAAAAAAEAAf/+AgAAAA==

‎mysql-test/suite/binlog/r/binlog_stm_binlog.result

+1
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,7 @@ unique_checks OFF
845845
# INSERT INTO t1 VALUES(2)
846846
# foreign_key_checks=1 and unique_checks=1
847847
# It should not change current session's variables, even error happens
848+
call mtr.add_suppression("Slave SQL.*Could not execute Write_rows event on table test.t1; Duplicate entry .2. for key .PRIMARY., Error_code: 1062");
848849
BINLOG '
849850
dfLtTBMBAAAAKQAAAKsBAAAAABcAAAAAAAEABHRlc3QAAnQxAAEDAAE=
850851
dfLtTBcBAAAAIgAAAM0BAAAAABcAAAAAAAEAAf/+AgAAAA==

‎mysql-test/suite/binlog/t/binlog_base64_flag.test

+2
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ iONkSBcBAAAAKwAAAMQBAAAQABAAAAAAAAEAA//4AQAAAAMAMTIzAQAAAA==
151151

152152
drop table t1, char63_utf8, char128_utf8;
153153

154+
call mtr.add_suppression("Slave SQL.*master suffers from this bug: http:..bugs.mysql.com.bug.php.id=37426.* Error_code: 1105");
155+
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
154156

155157
--echo #
156158
--echo # Bug #54393: crash and/or valgrind errors in

‎mysql-test/suite/rpl/r/rpl_binlog_corruption.result

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
include/master-slave.inc
22
[connection master]
33
call mtr.add_suppression('Found invalid event in binary log');
4+
call mtr.add_suppression('Slave SQL.*Relay log read failure: Could not parse relay log event entry.* 1594');
45
==== Initialize ====
56
include/stop_slave.inc
67
RESET SLAVE;

‎mysql-test/suite/rpl/r/rpl_binlog_max_cache_size.result

+1
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ include/stop_slave.inc
125125
include/start_slave.inc
126126
CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage.*");
127127
CALL mtr.add_suppression("Writing one row to the row-based binary log failed.*");
128+
CALL mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occured on the master. Message: error writing to the binary log");
128129
TRUNCATE t1;
129130
SET GLOBAL max_binlog_cache_size= ORIGINAL_VALUE;
130131
SET GLOBAL binlog_cache_size= ORIGINAL_VALUE;

‎mysql-test/suite/rpl/r/rpl_bug33931.result

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
include/master-slave.inc
22
[connection master]
33
call mtr.add_suppression("Failed during slave I/O thread initialization");
4+
call mtr.add_suppression("Slave SQL.*Failed during slave thread initialization.* 1593");
45
include/stop_slave.inc
56
reset slave;
67
SET GLOBAL debug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init";

‎mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ SET GLOBAL SQL_SLAVE_SKIP_COUNTER = 1;
4646
include/start_slave.inc
4747
INSERT INTO t1 VALUES(6,'C',2);
4848
INSERT INTO t1(b,c) VALUES('B',2);
49+
call mtr.add_suppression("Slave SQL.*Duplicate entry .6. for key .PRIMARY.* Error_code: 1062");
4950
include/wait_for_slave_sql_error.inc [errno=1062]
5051
INSERT INTO t1(b,c) VALUES('A',2);
5152
INSERT INTO t1(b,c) VALUES('D',2);

‎mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result

+12
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex(f11)
5858
27 27 27 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
5959
29 29 29 second 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
6060
30 30 30 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
61+
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535");
62+
call mtr.add_suppression("Slave SQL.*Error .Can.t DROP .c7.; check that column.key exists. on query.* 1091");
63+
call mtr.add_suppression("Slave SQL.*Error .Unknown column .c7. in .t15.. on query.* 1054");
64+
call mtr.add_suppression("Slave SQL.*Error .Key column .c6. doesn.t exist in table. on query.* 1072");
6165

6266
* Select count and 20 rows from Slave *
6367

@@ -929,6 +933,10 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex(f11)
929933
27 27 27 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
930934
29 29 29 second 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
931935
30 30 30 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
936+
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535");
937+
call mtr.add_suppression("Slave SQL.*Error .Can.t DROP .c7.; check that column.key exists. on query.* 1091");
938+
call mtr.add_suppression("Slave SQL.*Error .Unknown column .c7. in .t15.. on query.* 1054");
939+
call mtr.add_suppression("Slave SQL.*Error .Key column .c6. doesn.t exist in table. on query.* 1072");
932940

933941
* Select count and 20 rows from Slave *
934942

@@ -1800,6 +1808,10 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex(f11)
18001808
27 27 27 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
18011809
29 29 29 second 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
18021810
30 30 30 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
1811+
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535");
1812+
call mtr.add_suppression("Slave SQL.*Error .Can.t DROP .c7.; check that column.key exists. on query.* 1091");
1813+
call mtr.add_suppression("Slave SQL.*Error .Unknown column .c7. in .t15.. on query.* 1054");
1814+
call mtr.add_suppression("Slave SQL.*Error .Key column .c6. doesn.t exist in table. on query.* 1072");
18031815

18041816
* Select count and 20 rows from Slave *
18051817

‎mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result

+12
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex(f11)
5858
27 27 27 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
5959
29 29 29 second 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
6060
30 30 30 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
61+
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535");
62+
call mtr.add_suppression("Slave SQL.*Error .Can.t DROP .c7.; check that column.key exists. on query.* 1091");
63+
call mtr.add_suppression("Slave SQL.*Error .Unknown column .c7. in .t15.. on query.* 1054");
64+
call mtr.add_suppression("Slave SQL.*Error .Key column .c6. doesn.t exist in table. on query.* 1072");
6165

6266
* Select count and 20 rows from Slave *
6367

@@ -929,6 +933,10 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex(f11)
929933
27 27 27 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
930934
29 29 29 second 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
931935
30 30 30 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
936+
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535");
937+
call mtr.add_suppression("Slave SQL.*Error .Can.t DROP .c7.; check that column.key exists. on query.* 1091");
938+
call mtr.add_suppression("Slave SQL.*Error .Unknown column .c7. in .t15.. on query.* 1054");
939+
call mtr.add_suppression("Slave SQL.*Error .Key column .c6. doesn.t exist in table. on query.* 1072");
932940

933941
* Select count and 20 rows from Slave *
934942

@@ -1800,6 +1808,10 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex(f11)
18001808
27 27 27 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
18011809
29 29 29 second 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
18021810
30 30 30 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
1811+
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535");
1812+
call mtr.add_suppression("Slave SQL.*Error .Can.t DROP .c7.; check that column.key exists. on query.* 1091");
1813+
call mtr.add_suppression("Slave SQL.*Error .Unknown column .c7. in .t15.. on query.* 1054");
1814+
call mtr.add_suppression("Slave SQL.*Error .Key column .c6. doesn.t exist in table. on query.* 1072");
18031815

18041816
* Select count and 20 rows from Slave *
18051817

‎mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result

+3
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,9 @@ c4 BLOB, c5 CHAR(5)) ENGINE='InnoDB';
460460
RESET MASTER;
461461
*** Start Slave ***
462462
START SLAVE;
463+
call mtr.add_suppression("Slave SQL.*Error .Unknown table .t6.. on query.* Error_code: 1051");
464+
call mtr.add_suppression("Slave SQL.*Error .Duplicate column name .c6.. on query.* Error_code: 1060");
465+
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column . ...e mismatch.* Error_code: 1535");
463466
*** Master Data Insert ***
464467
set @b1 = 'b1b1b1b1';
465468
set @b1 = concat(@b1,@b1);

‎mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result

+3
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,9 @@ c4 BLOB, c5 CHAR(5)) ENGINE='MyISAM';
460460
RESET MASTER;
461461
*** Start Slave ***
462462
START SLAVE;
463+
call mtr.add_suppression("Slave SQL.*Error .Unknown table .t6.. on query.* Error_code: 1051");
464+
call mtr.add_suppression("Slave SQL.*Error .Duplicate column name .c6.. on query.* Error_code: 1060");
465+
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column . ...e mismatch.* Error_code: 1535");
463466
*** Master Data Insert ***
464467
set @b1 = 'b1b1b1b1';
465468
set @b1 = concat(@b1,@b1);

‎mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ UPDATE t4 LEFT JOIN (t1, t2, t5) ON (t1.id=t4.id and t2.id=t4.id and t5.id=t4.id
4242
UPDATE t4 LEFT JOIN (t1, t6, t7) ON (t4.id=t1.id and t4.id=t6.id and t4.id=t7.id) SET a=0, d=0, f=0, g=0 where t4.id=1;
4343
UPDATE t7 LEFT JOIN (t4, t1, t2) ON (t7.id=t4.id and t7.id=t1.id and t7.id=t2.id) SET a=0, b=0, d=0, g=0 where t7.id=1;
4444
UPDATE t7 LEFT JOIN (t8, t4, t1) ON (t7.id=t8.id and t7.id=t4.id and t7.id=t1.id) SET a=0, d=0, g=0, h=0 where t7.id=1;
45+
call mtr.add_suppression("Slave SQL.*Error .Table .test.t[47]. doesn.t exist. on query.* Error_code: 1146");
4546
UPDATE t1 LEFT JOIN t4 ON (t1.id=t4.id) SET a=0 where t1.id=1;
4647
include/wait_for_slave_sql_error_and_skip.inc [errno=1146]
4748
Last_SQL_Error = 'Error 'Table 'test.t4' doesn't exist' on query. Default database: 'test'. Query: 'UPDATE t1 LEFT JOIN t4 ON (t1.id=t4.id) SET a=0 where t1.id=1''

‎mysql-test/suite/rpl/r/rpl_idempotency.result

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
include/master-slave.inc
22
[connection master]
3-
call mtr.add_suppression("Slave: Can't find record in 't.' Error_code: 1032");
4-
call mtr.add_suppression("Slave: Cannot delete or update a parent row: a foreign key constraint fails .* Error_code: 1451");
5-
call mtr.add_suppression("Slave: Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452");
3+
call mtr.add_suppression("Can.t find record in .t[12].* Error_code: 1032");
4+
call mtr.add_suppression("Cannot delete or update a parent row: a foreign key constraint fails .* Error_code: 1451");
5+
call mtr.add_suppression("Cannot add or update a child row: a foreign key constraint fails .* Error_code: 1452");
6+
call mtr.add_suppression("Slave SQL.*Could not execute Write_rows event on table test.* Duplicate entry .1. for key .PRIMARY.* Error_code: 1062");
67
SET @old_slave_exec_mode= @@global.slave_exec_mode;
78
CREATE TABLE t1 (a INT PRIMARY KEY);
89
CREATE TABLE t2 (a INT);

‎mysql-test/suite/rpl/r/rpl_ignore_table.result

+1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ show grants for mysqltest4@localhost;
112112
Grants for mysqltest4@localhost
113113
GRANT USAGE ON *.* TO 'mysqltest4'@'localhost' IDENTIFIED BY PASSWORD '*196BDEDE2AE4F84CA44C47D54D78478C7E2BD7B7'
114114
set global slave_exec_mode='IDEMPOTENT';
115+
call mtr.add_suppression("Slave SQL.*Could not execute Delete_rows event on table mysql.* Error_code: 1032");
115116
drop table t1, mysqltest2.t2;
116117
drop table t4;
117118
drop database mysqltest2;

‎mysql-test/suite/rpl/r/rpl_incident.result

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ a
1515
2
1616
3
1717
4
18+
call mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occured on the master.* 1590");
1819
include/wait_for_slave_sql_error.inc [errno=1590]
1920
Last_SQL_Error = 'The incident LOST_EVENTS occured on the master. Message: <none>'
2021
**** On Slave ****

‎mysql-test/suite/rpl/r/rpl_init_slave_errors.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SET GLOBAL debug= "d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on
66
start slave;
77
include/wait_for_slave_sql_error.inc [errno=1593]
88
Last_SQL_Error = 'Failed during slave thread initialization'
9-
call mtr.add_suppression("Failed during slave I/O thread initialization");
9+
call mtr.add_suppression("Failed during slave.* thread initialization");
1010
SET GLOBAL debug= "";
1111
reset slave;
1212
SET GLOBAL init_slave= "garbage";

‎mysql-test/suite/rpl/r/rpl_known_bugs_detection.result

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ SELECT * FROM t1;
77
a b
88
1 10
99
2 2
10+
call mtr.add_suppression("Slave SQL.*suffer.*http:..bugs.mysql.com.bug.php.id=24432");
1011
include/wait_for_slave_sql_error.inc [errno=1105]
1112
Last_SQL_Error = 'Error 'master may suffer from http://bugs.mysql.com/bug.php?id=24432 so slave stops; check error log on slave for more info' on query. Default database: 'test'. Query: 'INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10''
1213
SELECT * FROM t1;

‎mysql-test/suite/rpl/r/rpl_loaddata.result

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ drop table t3;
2727
create table t1(a int, b int, unique(b));
2828
insert into t1 values(1,10);
2929
load data infile '../../std_data/rpl_loaddata.dat' into table t1;
30+
call mtr.add_suppression("Slave SQL.*Error .Duplicate entry .10. for key .b.. on query.* Error_code: 1062");
31+
call mtr.add_suppression("Slave SQL.*Query caused different errors on master and slave.*Error on master:.*error code=1062.*Error on slave:.*Error_code: 0");
3032
include/wait_for_slave_sql_error_and_skip.inc [errno=1062]
3133
include/check_slave_no_error.inc
3234
set sql_log_bin=0;

‎mysql-test/suite/rpl/r/rpl_loaddata_concurrent.result

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ drop table t3;
3838
create table t1(a int, b int, unique(b));
3939
insert into t1 values(1,10);
4040
load data CONCURRENT infile '../../std_data/rpl_loaddata.dat' into table t1;
41+
call mtr.add_suppression("Slave SQL.*Error .Duplicate entry .10. for key .b.. on query.* Error_code: 1062");
42+
call mtr.add_suppression("Slave SQL.*Query caused different errors on master and slave.*Error on master:.*error code=1062.*Error on slave:.*Error_code: 0");
4143
include/wait_for_slave_sql_error_and_skip.inc [errno=1062]
4244
include/check_slave_no_error.inc
4345
set sql_log_bin=0;

‎mysql-test/suite/rpl/r/rpl_loaddata_fatal.result

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ include/master-slave.inc
33
CREATE TABLE t1 (a INT, b INT);
44
INSERT INTO t1 VALUES (1,10);
55
LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE t1;
6+
call mtr.add_suppression("Slave SQL.*Fatal error: Not enough memory, Error_code: 1593");
67
include/wait_for_slave_sql_error_and_skip.inc [errno=1593]
78
Last_SQL_Error = 'Fatal error: Not enough memory'
89
DROP TABLE t1;

‎mysql-test/suite/rpl/r/rpl_rotate_logs.result

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ drop table temp_table, t3;
3636
insert into t2 values(1234);
3737
set insert_id=1234;
3838
insert into t2 values(NULL);
39+
call mtr.add_suppression("Slave SQL.*Error .Duplicate entry .1234. for key .PRIMARY.. on query.* Error_code: 1062");
3940
include/wait_for_slave_sql_error_and_skip.inc [errno=1062]
4041
purge master logs to 'master-bin.000002';
4142
show master logs;

‎mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ DROP TABLE t1;
6363
include/rpl_reset.inc
6464
**** On Slave ****
6565
SET GLOBAL QUERY_CACHE_SIZE=0;
66+
call mtr.add_suppression("Slave SQL.*Could not execute Update_rows event on table test.t1.* Error_code: 1032");
6667
**** On Master ****
6768
CREATE TABLE t1 (a INT);
6869
INSERT INTO t1 VALUES (1),(2),(3);

‎mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result

+2
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,8 @@ include/diff_tables.inc [master:t2, slave:t2]
478478
[expecting slave to stop]
479479
INSERT INTO t3 VALUES (1, "", 1);
480480
INSERT INTO t3 VALUES (2, repeat(_utf8'a', 128), 2);
481+
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
482+
call mtr.add_suppression("Slave SQL.*Could not execute Delete_rows event on table test.t1.* Error_code: 1032");
481483
include/wait_for_slave_sql_error.inc [errno=1535]
482484
Last_SQL_Error = 'Table definition on master and slave does not match: Column 1 size mismatch - master has size 384, test.t3 on slave has size 49. Master's column size should be <= the slave's column size.'
483485
include/rpl_reset.inc

0 commit comments

Comments
 (0)