1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-35344: post-fix correction for other galera tests

Browse Source
This commit is contained in:
Julius Goryavsky 2024-11-06 01:39:31 +01:00
parent e4a3a11dcc
commit db68eb69f9
30 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/galera/r/MDEV-10715.result
View File

@ -27,4 +27,4 @@ wsrep_last_written_gtid()
connection node_1; connection node_1;
drop table t1; drop table t1;
connection node_2; connection node_2;
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");

2
mysql-test/suite/galera/r/MDEV-27806.result
View File

@ -49,4 +49,4 @@ mysqld-bin.000003 # Query # # COMMIT
BINLOG_POSITIONS_MATCH BINLOG_POSITIONS_MATCH
1 1
DROP TABLE t1,ts1; DROP TABLE t1,ts1;
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");

2
mysql-test/suite/galera/r/galera_gtid_server_id.result
View File

@ -5,7 +5,7 @@ select @@gtid_domain_id, @@server_id, @@wsrep_gtid_domain_id,@@wsrep_gtid_mode;
@@gtid_domain_id @@server_id @@wsrep_gtid_domain_id @@wsrep_gtid_mode @@gtid_domain_id @@server_id @@wsrep_gtid_domain_id @@wsrep_gtid_mode
0 11 1 1 0 11 1 1
connection node_2; connection node_2;
call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node");
select @@gtid_domain_id, @@server_id, @@wsrep_gtid_domain_id,@@wsrep_gtid_mode; select @@gtid_domain_id, @@server_id, @@wsrep_gtid_domain_id,@@wsrep_gtid_mode;
@@gtid_domain_id @@server_id @@wsrep_gtid_domain_id @@wsrep_gtid_mode @@gtid_domain_id @@server_id @@wsrep_gtid_domain_id @@wsrep_gtid_mode
0 12 1 1 0 12 1 1

2
mysql-test/suite/galera/r/galera_gtid_slave.result
View File

@ -42,4 +42,4 @@ SET GLOBAL wsrep_on=ON;
connection node_3; connection node_3;
reset master; reset master;
connection node_2; connection node_2;
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");

2
mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result
View File

@ -167,4 +167,4 @@ set global wsrep_on=ON;
connection node_3; connection node_3;
reset master; reset master;
connection node_2; connection node_2;
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");

2
mysql-test/suite/galera/r/galera_gtid_trx_conflict.result
View File

@ -42,4 +42,4 @@ SELECT @@gtid_binlog_state;
@@gtid_binlog_state @@gtid_binlog_state
1-1-101 1-1-101
DROP TABLE t1; DROP TABLE t1;
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");

2
mysql-test/suite/galera/r/galera_last_committed_id.result
View File

@ -34,4 +34,4 @@ wsrep_last_written_id_advanced
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
DROP TABLE t1; DROP TABLE t1;
connection node_2; connection node_2;
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");

4
mysql-test/suite/galera/r/galera_query_cache_invalidate.result
View File

@ -3,9 +3,9 @@ connection node_1;
connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3; connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
connect node_4, 127.0.0.1, root, , test, $NODE_MYPORT_4; connect node_4, 127.0.0.1, root, , test, $NODE_MYPORT_4;
connection node_2; connection node_2;
call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node");
connection node_4; connection node_4;
call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node");
connection node_3; connection node_3;
CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_port=NODE_MYPORT_1, master_use_gtid=current_pos;; CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_port=NODE_MYPORT_1, master_use_gtid=current_pos;;
START SLAVE; START SLAVE;

2
mysql-test/suite/galera/r/galera_sync_wait_upto.result
View File

@ -24,4 +24,4 @@ WSREP_SYNC_WAIT_UPTO
connection node_1; connection node_1;
DROP TABLE t1; DROP TABLE t1;
connection node_2; connection node_2;
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");

2
mysql-test/suite/galera/r/galera_var_gtid_domain_id.result
View File

@ -90,7 +90,7 @@ set global wsrep_on=OFF;
reset master; reset master;
set global wsrep_on=ON; set global wsrep_on=ON;
connection node_2; connection node_2;
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");
disconnect node_2; disconnect node_2;
disconnect node_1; disconnect node_1;
# End of test # End of test

2
mysql-test/suite/galera/r/mdev_10518.result
View File

@ -90,7 +90,7 @@ set global wsrep_on=OFF;
reset master; reset master;
set global wsrep_on=ON; set global wsrep_on=ON;
connection node_2; connection node_2;
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");
disconnect node_2; disconnect node_2;
disconnect node_1; disconnect node_1;
# End of test # End of test

2
mysql-test/suite/galera/t/MDEV-10715.test
View File

@ -19,4 +19,4 @@ select wsrep_last_written_gtid();
drop table t1; drop table t1;
--connection node_2 --connection node_2
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");

2
mysql-test/suite/galera/t/MDEV-27806.test
View File

@ -48,4 +48,4 @@ CREATE TABLE ts1 AS SELECT * FROM t1;
DROP TABLE t1,ts1; DROP TABLE t1,ts1;
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");

2
mysql-test/suite/galera/t/galera_gtid_server_id.test
View File

@ -3,7 +3,7 @@
--connection node_1 --connection node_1
select @@gtid_domain_id, @@server_id, @@wsrep_gtid_domain_id,@@wsrep_gtid_mode; select @@gtid_domain_id, @@server_id, @@wsrep_gtid_domain_id,@@wsrep_gtid_mode;
--connection node_2 --connection node_2
call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node");
select @@gtid_domain_id, @@server_id, @@wsrep_gtid_domain_id,@@wsrep_gtid_mode; select @@gtid_domain_id, @@server_id, @@wsrep_gtid_domain_id,@@wsrep_gtid_mode;
--connection node_1 --connection node_1

2
mysql-test/suite/galera/t/galera_gtid_slave.test
View File

@ -92,4 +92,4 @@ SET GLOBAL wsrep_on=ON;
reset master; reset master;
--connection node_2 --connection node_2
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");

2
mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test
View File

@ -199,4 +199,4 @@ set global wsrep_on=ON;
reset master; reset master;
--connection node_2 --connection node_2
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");

2
mysql-test/suite/galera/t/galera_gtid_trx_conflict.test
View File

@ -53,4 +53,4 @@ SELECT @@gtid_binlog_state;
SELECT @@gtid_binlog_state; SELECT @@gtid_binlog_state;
DROP TABLE t1; DROP TABLE t1;
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");

2
mysql-test/suite/galera/t/galera_last_committed_id.test
View File

@ -66,4 +66,4 @@ SET AUTOCOMMIT=ON;
DROP TABLE t1; DROP TABLE t1;
--connection node_2 --connection node_2
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");

4
mysql-test/suite/galera/t/galera_query_cache_invalidate.test
View File

@ -22,9 +22,9 @@
--connect node_4, 127.0.0.1, root, , test, $NODE_MYPORT_4 --connect node_4, 127.0.0.1, root, , test, $NODE_MYPORT_4
--connection node_2 --connection node_2
call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node");
--connection node_4 --connection node_4
call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node");
--connection node_3 --connection node_3

2
mysql-test/suite/galera/t/galera_sync_wait_upto.test
View File

@ -73,4 +73,4 @@ INSERT INTO t1 VALUES (2);
DROP TABLE t1; DROP TABLE t1;
--connection node_2 --connection node_2
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");

2
mysql-test/suite/galera/t/galera_var_gtid_domain_id.test
View File

@ -60,7 +60,7 @@ reset master;
set global wsrep_on=ON; set global wsrep_on=ON;
--connection node_2 --connection node_2
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");
--source include/galera_end.inc --source include/galera_end.inc
--echo # End of test --echo # End of test

2
mysql-test/suite/galera/t/mdev_10518.test
View File

@ -60,7 +60,7 @@ reset master;
set global wsrep_on=ON; set global wsrep_on=ON;
--connection node_2 --connection node_2
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");
--source include/galera_end.inc --source include/galera_end.inc
--echo # End of test --echo # End of test

4
mysql-test/suite/galera_3nodes/r/MDEV-29171.result
View File

@ -56,7 +56,7 @@ connection node_1;
set global wsrep_gtid_domain_id=100; set global wsrep_gtid_domain_id=100;
connection node_2; connection node_2;
set global wsrep_gtid_domain_id=100; set global wsrep_gtid_domain_id=100;
CALL mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); CALL mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node");
connection node_3; connection node_3;
set global wsrep_gtid_domain_id=100; set global wsrep_gtid_domain_id=100;
CALL mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); CALL mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node");

8
mysql-test/suite/galera_3nodes/r/galera_2_cluster.result
View File

@ -75,19 +75,19 @@ connection node_2;
SET GLOBAL wsrep_on = OFF; SET GLOBAL wsrep_on = OFF;
RESET MASTER; RESET MASTER;
SET GLOBAL wsrep_on = ON; SET GLOBAL wsrep_on = ON;
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");
connection node_3; connection node_3;
SET GLOBAL wsrep_on = OFF; SET GLOBAL wsrep_on = OFF;
RESET MASTER; RESET MASTER;
SET GLOBAL wsrep_on = ON; SET GLOBAL wsrep_on = ON;
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");
connection node_5; connection node_5;
SET GLOBAL wsrep_on = OFF; SET GLOBAL wsrep_on = OFF;
RESET MASTER; RESET MASTER;
SET GLOBAL wsrep_on = ON; SET GLOBAL wsrep_on = ON;
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");
connection node_6; connection node_6;
SET GLOBAL wsrep_on = OFF; SET GLOBAL wsrep_on = OFF;
RESET MASTER; RESET MASTER;
SET GLOBAL wsrep_on = ON; SET GLOBAL wsrep_on = ON;
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");

4
mysql-test/suite/galera_3nodes/r/galera_gtid_consistency.result
View File

@ -199,12 +199,12 @@ SELECT COUNT(*) FROM t1;
COUNT(*) COUNT(*)
1950 1950
connection node_2; connection node_2;
call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node"); call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node");
call mtr.add_suppression("Sending JOIN failed: "); call mtr.add_suppression("Sending JOIN failed: ");
call mtr.add_suppression("WSREP: Failed to JOIN the cluster after SST"); call mtr.add_suppression("WSREP: Failed to JOIN the cluster after SST");
call mtr.add_suppression("WSREP: FLOW message from member .* in non-primary configuration"); call mtr.add_suppression("WSREP: FLOW message from member .* in non-primary configuration");
connection node_3; connection node_3;
call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node"); call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node");
call mtr.add_suppression("Sending JOIN failed: "); call mtr.add_suppression("Sending JOIN failed: ");
call mtr.add_suppression("WSREP: Failed to JOIN the cluster after SST"); call mtr.add_suppression("WSREP: Failed to JOIN the cluster after SST");
call mtr.add_suppression("WSREP: FLOW message from member .* in non-primary configuration"); call mtr.add_suppression("WSREP: FLOW message from member .* in non-primary configuration");

4
mysql-test/suite/galera_3nodes/t/MDEV-29171.test
View File

@ -119,8 +119,8 @@ set global wsrep_gtid_domain_id=100;
--connection node_2 --connection node_2
set global wsrep_gtid_domain_id=100; set global wsrep_gtid_domain_id=100;
CALL mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); CALL mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node");
--connection node_3 --connection node_3
set global wsrep_gtid_domain_id=100; set global wsrep_gtid_domain_id=100;
CALL mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); CALL mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node");

8
mysql-test/suite/galera_3nodes/t/galera_2_cluster.test
View File

@ -129,7 +129,7 @@ SET GLOBAL wsrep_on = OFF;
RESET MASTER; RESET MASTER;
SET GLOBAL wsrep_on = ON; SET GLOBAL wsrep_on = ON;
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");
--connection node_3 --connection node_3
@ -137,7 +137,7 @@ SET GLOBAL wsrep_on = OFF;
RESET MASTER; RESET MASTER;
SET GLOBAL wsrep_on = ON; SET GLOBAL wsrep_on = ON;
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");
--connection node_5 --connection node_5
@ -145,7 +145,7 @@ SET GLOBAL wsrep_on = OFF;
RESET MASTER; RESET MASTER;
SET GLOBAL wsrep_on = ON; SET GLOBAL wsrep_on = ON;
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");
--connection node_6 --connection node_6
@ -153,4 +153,4 @@ SET GLOBAL wsrep_on = OFF;
RESET MASTER; RESET MASTER;
SET GLOBAL wsrep_on = ON; SET GLOBAL wsrep_on = ON;
CALL mtr.add_suppression("Ignoring server id for non bootstrap node"); CALL mtr.add_suppression("Ignoring server id .* for non bootstrap node");

4
mysql-test/suite/galera_3nodes/t/galera_gtid_consistency.test
View File

@ -343,12 +343,12 @@ SELECT COUNT(*) FROM t1;
# cleanups # cleanups
# #
--connection node_2 --connection node_2
call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node"); call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node");
call mtr.add_suppression("Sending JOIN failed: "); call mtr.add_suppression("Sending JOIN failed: ");
call mtr.add_suppression("WSREP: Failed to JOIN the cluster after SST"); call mtr.add_suppression("WSREP: Failed to JOIN the cluster after SST");
call mtr.add_suppression("WSREP: FLOW message from member .* in non-primary configuration"); call mtr.add_suppression("WSREP: FLOW message from member .* in non-primary configuration");
--connection node_3 --connection node_3
call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node"); call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node");
call mtr.add_suppression("Sending JOIN failed: "); call mtr.add_suppression("Sending JOIN failed: ");
call mtr.add_suppression("WSREP: Failed to JOIN the cluster after SST"); call mtr.add_suppression("WSREP: Failed to JOIN the cluster after SST");
call mtr.add_suppression("WSREP: FLOW message from member .* in non-primary configuration"); call mtr.add_suppression("WSREP: FLOW message from member .* in non-primary configuration");

2
mysql-test/suite/galera_sr/r/mdev_18631.result
View File

@ -5,7 +5,7 @@ connection node_1;
CREATE TABLE t1(f1 INT PRIMARY KEY) ENGINE=INNODB; CREATE TABLE t1(f1 INT PRIMARY KEY) ENGINE=INNODB;
INSERT INTO t1 VALUES (1), (2), (3); INSERT INTO t1 VALUES (1), (2), (3);
connection node_2; connection node_2;
call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node");
SELECT * FROM t1; SELECT * FROM t1;
f1 f1
1 1

2
mysql-test/suite/galera_sr/t/mdev_18631.test
View File

@ -13,7 +13,7 @@ CREATE TABLE t1(f1 INT PRIMARY KEY) ENGINE=INNODB;
INSERT INTO t1 VALUES (1), (2), (3); INSERT INTO t1 VALUES (1), (2), (3);
--connection node_2 --connection node_2
call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node\\."); call mtr.add_suppression("WSREP: Ignoring server id .* for non bootstrap node");
SELECT * FROM t1; SELECT * FROM t1;
--connection node_1 --connection node_1