Skip to content

Commit fba6bdf

Browse files
bjornmubjornmu
committed
Upmerge 11762407 (54999) with additions
2 parents 562978e + 1f9d8cd commit fba6bdf

File tree

80 files changed

+152
-17
lines changed

Some content is hidden

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

80 files changed

+152
-17
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,7 @@ SHOW SESSION VARIABLES LIKE "%_checks";
345345
--echo # INSERT INTO t1 VALUES(2)
346346
--echo # foreign_key_checks=1 and unique_checks=1
347347
--echo # It should not change current session's variables, even error happens
348+
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");
348349
--error 1062
349350
BINLOG '
350351
dfLtTBMBAAAAKQAAAKsBAAAAABcAAAAAAAEABHRlc3QAAnQxAAEDAAE=

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

+1
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ source include/start_slave.inc;
382382
CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage.*");
383383
CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_stmt_cache_size' bytes of storage.*");
384384
CALL mtr.add_suppression("Writing one row to the row-based binary log failed.*");
385+
CALL mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occured on the master. Message: error writing to the binary log");
385386

386387
connection master;
387388
TRUNCATE t1;

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

+2
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ if (`SELECT @@global.binlog_format != 'ROW' OR @@global.slave_exec_mode = 'STRIC
9797
--disable_query_log
9898
--eval SELECT "$err" as 'Last_SQL_Error (expected "duplicate key" error)'
9999
--enable_query_log
100+
call mtr.add_suppression("Slave SQL.*Duplicate entry .1. for key .PRIMARY.* Error_code: 1062");
100101

101102
SELECT * FROM t1;
102103

@@ -142,6 +143,7 @@ connection slave;
142143
# replication continues.
143144
if (`SELECT @@global.binlog_format = 'ROW' AND @@global.slave_exec_mode = 'STRICT'`) {
144145
--echo ---- Wait until slave stops with an error ----
146+
call mtr.add_suppression("Slave SQL.*Can.t find record in .t1., Error_code: 1032");
145147
let $slave_sql_errno= 1032; # ER_KEY_NOT_FOUND
146148
source include/wait_for_slave_sql_error.inc;
147149

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

+7
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,13 @@ 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+
call mtr.add_suppression("Slave SQL.*Column 2 of table .test.t1.. cannot be converted from type.* Error_code: 1677");
130+
124131
sync_slave_with_master;
125132
--echo
126133
--echo * Select count and 20 rows from Slave *

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

+5
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#################################################
1515

1616
call mtr.add_suppression("Slave: Unknown table 't6' Error_code: 1051");
17+
call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. cannot be converted from type.* Error_code: 1677");
1718

1819
--echo **** Diff Table Def Start ****
1920

@@ -769,6 +770,10 @@ RESET MASTER;
769770
connection slave;
770771
START SLAVE;
771772

773+
call mtr.add_suppression("Error .Unknown table .t6.. on query.* Error_code: 1051");
774+
call mtr.add_suppression("Error .Duplicate column name .c6.. on query.* Error_code: 1060");
775+
call mtr.add_suppression("Table definition on master and slave does not match: Column . ...e mismatch.* Error_code: 1535");
776+
772777
--echo *** Master Data Insert ***
773778
connection master;
774779
set @b1 = 'b1b1b1b1';

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

+2
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ eval $lower_stmt_head infile '../../std_data/rpl_loaddata.dat' into table t1;
6969
save_master_pos;
7070
connection slave;
7171
# 1062 = ER_DUP_ENTRY
72+
call mtr.add_suppression("Slave SQL.*Error .Duplicate entry .10. for key .b.. on query.* Error_code: 1062");
73+
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");
7274
--let $slave_sql_errno= 1062
7375
--source include/wait_for_slave_sql_error_and_skip.inc
7476

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

+3
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,9 @@ source include/diff_tables.inc;
382382

383383
connection slave;
384384
SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
385+
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
386+
call mtr.add_suppression("Slave SQL.*Could not execute Delete_rows event on table test.t1.* Error_code: 1032");
387+
call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t.. cannot be converted from type.*, Error_code: 1677");
385388

386389
--let $rpl_only_running_threads= 1
387390
--source include/rpl_reset.inc

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

+2
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ 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");
151+
call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]. cannot be converted from type.* Error_code: 1677");
150152
--let $slave_skip_counter= 2
151153
--let $slave_sql_errno= 1677
152154
--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/extra/rpl_tests/rpl_stop_middle_group.test

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ insert into tm set a=null; # to simulate killed status on the slave
2323
commit;
2424

2525
connection slave;
26+
call mtr.add_suppression("Slave SQL.*slave SQL thread is being stopped in the middle of applying of a group having updated a non-transaction table");
27+
call mtr.add_suppression("Slave SQL.*The slave SQL is stopped, leaving the current group of events unfinished with a non-transaction table changed.");
2628

2729
# slave will catch the killed status but won't shut down immediately
2830
# only after the whole group has done (commit)

‎mysql-test/include/mtr_warnings.sql

-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ INSERT INTO global_suppressions VALUES
125125
("Slave: The incident LOST_EVENTS occured on the master"),
126126
("Slave: Unknown error.* 1105"),
127127
("Slave: Can't drop database.* database doesn't exist"),
128-
("Slave SQL:.*(Error_code: \[\[:digit:\]\]+|Query:.*)"),
129128
("Sort aborted"),
130129
("Time-out in NDB"),
131130
("Warning:\s+One can only use the --user.*root"),

‎mysql-test/r/flush_read_lock.result

+1
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@ Success: Was able to run 'execute stmt1' under FTWRL.
431431
Success: Was able to run 'execute stmt1' with FTWRL active in another connection.
432432
Success: Was able to run FTWRL while 'execute stmt1' was active in another connection.
433433
deallocate prepare stmt1;
434+
call mtr.add_suppression("Slave SQL.*Can.t execute the query because you have a conflicting read lock., Error_code: 1223");
434435
#
435436
# 9.2.b) EXECUTE for statement which is incompatible with FTWRL
436437
# should be also incompatible.

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

+3
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ 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");
96+
call mtr.add_suppression("Slave SQL.*Column 1 of table .test.char128_utf8. cannot be converted.* Error_code: 1677");
9497
#
9598
# Bug #54393: crash and/or valgrind errors in
9699
# 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
@@ -864,6 +864,7 @@ unique_checks OFF
864864
# INSERT INTO t1 VALUES(2)
865865
# foreign_key_checks=1 and unique_checks=1
866866
# It should not change current session's variables, even error happens
867+
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");
867868
BINLOG '
868869
dfLtTBMBAAAAKQAAAKsBAAAAABcAAAAAAAEABHRlc3QAAnQxAAEDAAE=
869870
dfLtTBcBAAAAIgAAAM0BAAAAABcAAAAAAAEAAf/+AgAAAA==

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

+3
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@ 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");
156+
call mtr.add_suppression("Slave SQL.*Column 1 of table .test.char128_utf8. cannot be converted.* Error_code: 1677");
154157

155158
--echo #
156159
--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_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

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ include/rpl_init.inc [topology=1->2->3->4->1]
55
CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT, b VARCHAR(100), c INT NOT NULL, PRIMARY KEY(a)) ENGINE=MyISAM;
66
CREATE TABLE t2 (a INT NOT NULL AUTO_INCREMENT, b VARCHAR(100), c INT NOT NULL, PRIMARY KEY(a)) ENGINE=InnoDB;
77
include/rpl_sync.inc
8+
call mtr.add_suppression("Slave SQL.*slave SQL thread is being stopped in the middle of applying of a group having updated a non-transaction table");
89

910
*** Testing schema A->B->C->D->A ***
1011

@@ -46,6 +47,7 @@ SET GLOBAL SQL_SLAVE_SKIP_COUNTER = 1;
4647
include/start_slave.inc
4748
INSERT INTO t1 VALUES(6,'C',2);
4849
INSERT INTO t1(b,c) VALUES('B',2);
50+
call mtr.add_suppression("Slave SQL.*Duplicate entry .6. for key .PRIMARY.* Error_code: 1062");
4951
include/wait_for_slave_sql_error.inc [errno=1062]
5052
INSERT INTO t1(b,c) VALUES('A',2);
5153
INSERT INTO t1(b,c) VALUES('D',2);

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

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

6166
* Select count and 20 rows from Slave *
6267

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

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

6166
* Select count and 20 rows from Slave *
6267

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

+4
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("Slave: Unknown table 't6' Error_code: 1051");
4+
call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. cannot be converted from type.* Error_code: 1677");
45
**** Diff Table Def Start ****
56
*** On Slave ***
67
STOP SLAVE;
@@ -461,6 +462,9 @@ c4 BLOB, c5 CHAR(5)) ENGINE='InnoDB';
461462
RESET MASTER;
462463
*** Start Slave ***
463464
START SLAVE;
465+
call mtr.add_suppression("Error .Unknown table .t6.. on query.* Error_code: 1051");
466+
call mtr.add_suppression("Error .Duplicate column name .c6.. on query.* Error_code: 1060");
467+
call mtr.add_suppression("Table definition on master and slave does not match: Column . ...e mismatch.* Error_code: 1535");
464468
*** Master Data Insert ***
465469
set @b1 = 'b1b1b1b1';
466470
set @b1 = concat(@b1,@b1);

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

+4
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("Slave: Unknown table 't6' Error_code: 1051");
4+
call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. cannot be converted from type.* Error_code: 1677");
45
**** Diff Table Def Start ****
56
*** On Slave ***
67
STOP SLAVE;
@@ -461,6 +462,9 @@ c4 BLOB, c5 CHAR(5)) ENGINE='MyISAM';
461462
RESET MASTER;
462463
*** Start Slave ***
463464
START SLAVE;
465+
call mtr.add_suppression("Error .Unknown table .t6.. on query.* Error_code: 1051");
466+
call mtr.add_suppression("Error .Duplicate column name .c6.. on query.* Error_code: 1060");
467+
call mtr.add_suppression("Table definition on master and slave does not match: Column . ...e mismatch.* Error_code: 1535");
464468
*** Master Data Insert ***
465469
set @b1 = 'b1b1b1b1';
466470
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_heartbeat_basic.result

+2
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,8 @@ Heartbeat event received
206206
CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(10), c LONGTEXT);
207207
INSERT INTO t1 VALUES (1, 'on slave', NULL);
208208
INSERT INTO t1 VALUES (1, 'on master', NULL);
209+
call mtr.add_suppression("Slave SQL.*Duplicate entry .1. for key .PRIMARY.. on query.* Error_code: 1062");
210+
call mtr.add_suppression("Slave SQL.*slave SQL thread is being stopped in the middle of applying of a group having updated a non-transaction table");
209211
Heartbeat events are received while sql thread stopped (1 means 'yes'): 1
210212
include/stop_slave.inc
211213
DROP TABLE t1;

‎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("Slave SQL.*Can.t find record in .t[12].* Error_code: 1032");
4+
call mtr.add_suppression("Slave SQL.*Cannot delete or update a parent row: a foreign key constraint fails .* Error_code: 1451");
5+
call mtr.add_suppression("Slave SQL.*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
CREATE TABLE t1 (a INT PRIMARY KEY);
78
CREATE TABLE t2 (a INT);
89
INSERT INTO t1 VALUES (-1),(-2),(-3);

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

+1
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ show grants for mysqltest4@localhost;
113113
Grants for mysqltest4@localhost
114114
GRANT USAGE ON *.* TO 'mysqltest4'@'localhost' IDENTIFIED BY PASSWORD '*196BDEDE2AE4F84CA44C47D54D78478C7E2BD7B7'
115115
set global slave_exec_mode='IDEMPOTENT';
116+
call mtr.add_suppression("Slave SQL.*Could not execute Delete_rows event on table mysql.* Error_code: 1032");
116117
drop table t1, mysqltest2.t2;
117118
drop table t4;
118119
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_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_mixed_binlog_max_cache_size.result

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ include/start_slave.inc
131131
CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage.*");
132132
CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_stmt_cache_size' bytes of storage.*");
133133
CALL mtr.add_suppression("Writing one row to the row-based binary log failed.*");
134+
CALL mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occured on the master. Message: error writing to the binary log");
134135
TRUNCATE t1;
135136
SET GLOBAL max_binlog_cache_size= ORIGINAL_VALUE;
136137
SET GLOBAL binlog_cache_size= ORIGINAL_VALUE;

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

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

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

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

0 commit comments

Comments
 (0)