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

MDEV-27697. Two affected tests fixed.

Browse Source 
A result file is updated in one case and former error simulation got
refined.
This commit is contained in:
Andrei
2022-04-26 17:03:32 +03:00
parent 5100b20b15
commit 945245aea4
4 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/binlog_encryption/rpl_parallel.result
View File

@ -1379,6 +1379,7 @@ include/stop_slave.inc
SET GLOBAL slave_parallel_threads=1; SET GLOBAL slave_parallel_threads=1;
SET @old_dbug= @@GLOBAL.debug_dbug; SET @old_dbug= @@GLOBAL.debug_dbug;
SET GLOBAL debug_dbug="+d,slave_discard_xid_for_gtid_0_x_1000"; SET GLOBAL debug_dbug="+d,slave_discard_xid_for_gtid_0_x_1000";
CALL mtr.add_suppression("Unexpected break of being relay-logged GTID");
connection server_1; connection server_1;
INSERT INTO t2 VALUES (101); INSERT INTO t2 VALUES (101);
INSERT INTO t2 VALUES (102); INSERT INTO t2 VALUES (102);

5
mysql-test/suite/rpl/r/rpl_parallel_temptable.result
View File

@ -132,8 +132,13 @@ connection server_1;
INSERT INTO t1 VALUES (0, 1); INSERT INTO t1 VALUES (0, 1);
include/save_master_gtid.inc include/save_master_gtid.inc
connection server_2; connection server_2;
set @@sql_log_bin=0;
call mtr.add_suppression("Unexpected break of being relay-logged GTID 1-1-32 event group by the current GTID event 0-1-4");
set @@sql_log_bin=1;
set @@global.debug_dbug="+d,slave_discard_xid_for_gtid_0_x_1000";
include/start_slave.inc include/start_slave.inc
include/sync_with_master_gtid.inc include/sync_with_master_gtid.inc
set @@global.debug_dbug="";
SELECT * FROM t1 ORDER BY a; SELECT * FROM t1 ORDER BY a;
a b a b
0 1 0 1

8
mysql-test/suite/rpl/t/rpl_parallel_temptable.test
View File

@ -201,9 +201,17 @@ INSERT INTO t1 VALUES (0, 1);
# execution of format_description event will not wait infinitely # execution of format_description event will not wait infinitely
# for a commit of the incomplete group that never happens. # for a commit of the incomplete group that never happens.
# Apart from the suppression, MDEV-27697 refinement to the original test needs
# an allowance to one time accept malformed event group.
set @@sql_log_bin=0;
call mtr.add_suppression("Unexpected break of being relay-logged GTID 1-1-32 event group by the current GTID event 0-1-4");
set @@sql_log_bin=1;
set @@global.debug_dbug="+d,slave_discard_xid_for_gtid_0_x_1000";
--source include/start_slave.inc --source include/start_slave.inc
#--sync_with_master #--sync_with_master
--source include/sync_with_master_gtid.inc --source include/sync_with_master_gtid.inc
set @@global.debug_dbug="";
SELECT * FROM t1 ORDER BY a; SELECT * FROM t1 ORDER BY a;
SHOW STATUS LIKE 'Slave_open_temp_tables'; SHOW STATUS LIKE 'Slave_open_temp_tables';

6
sql/slave.cc
View File

@ -6223,8 +6223,10 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len)
DBUG_EXECUTE_IF("slave_discard_xid_for_gtid_0_x_1000", DBUG_EXECUTE_IF("slave_discard_xid_for_gtid_0_x_1000",
{ {
/* Inject an event group that is missing its XID commit event. */ /* Inject an event group that is missing its XID commit event. */
if (mi->last_queued_gtid.domain_id == 0 && if ((mi->last_queued_gtid.domain_id == 0 &&
mi->last_queued_gtid.seq_no == 1000) mi->last_queued_gtid.seq_no == 1000) ||
(mi->last_queued_gtid.domain_id == 1 &&
mi->last_queued_gtid.seq_no == 32))
{ {
sql_print_warning( sql_print_warning(
"Unexpected break of being relay-logged GTID %u-%u-%llu " "Unexpected break of being relay-logged GTID %u-%u-%llu "