Disable galera_as_slave_gtid_replicate_do_db_cc because it crashes.

3 files changed, 45 insertions, 45 deletions

diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
index b1c28a0e594..24a75386511 100644
--- a/mysql-test/suite/galera/disabled.def
+++ b/mysql-test/suite/galera/disabled.def
@@ -19,6 +19,7 @@ MW-328A : MDEV-21483 galera.MW-328A galera.MW-328B
 MW-328B : MDEV-21483 galera.MW-328A galera.MW-328B
 MW-329 : MDEV-19962 Galera test failure on MW-329
 galera.galera_defaults : MDEV-21494 Galera test sporadic failure on galera.galera_defaults
+galera_as_slave_gtid_replicate_do_db_cc : MDEV-21796 Crash on galera.galera_as_slave_gtid_replicate_do_db_cc
 galera_as_slave_replication_bundle : MDEV-15785 OPTION_GTID_BEGIN is set in Gtid_log_event::do_apply_event()
 galera_autoinc_sst_mariabackup : Known issue, may require porting MDEV-17458 from later versions
 galera_bf_abort_group_commit : MDEV-18282 Galera test failure on galera.galera_bf_abort_group_commit
diff --git a/mysql-test/suite/galera/t/galera_as_slave_gtid_replicate_do_db_cc.cnf b/mysql-test/suite/galera/t/galera_as_slave_gtid_replicate_do_db_cc.cnf
new file mode 100644
index 00000000000..edd063b6554
--- /dev/null
+++ b/mysql-test/suite/galera/t/galera_as_slave_gtid_replicate_do_db_cc.cnf
@@ -0,0 +1,14 @@
+!include ../galera_2nodes_as_slave.cnf
+
+[mysqld]
+log-bin=mysqld-bin
+log-slave-updates
+binlog-format=ROW
+
+[mysqld.1]
+replicate-do-db=test1
+replicate-wild-do-table=test1.%
+
+[mysqld.2]
+replicate-do-db=test1
+replicate-wild-do-table=test1.%
diff --git a/mysql-test/suite/galera/t/galera_as_slave_gtid_replicate_do_db_cc.test b/mysql-test/suite/galera/t/galera_as_slave_gtid_replicate_do_db_cc.test
index 27698121c0d..c539617428e 100644
--- a/mysql-test/suite/galera/t/galera_as_slave_gtid_replicate_do_db_cc.test
+++ b/mysql-test/suite/galera/t/galera_as_slave_gtid_replicate_do_db_cc.test
@@ -6,32 +6,25 @@
 --source include/have_innodb.inc
 --source include/have_log_bin.inc
 --source include/big_test.inc
-
-# As node #1 is not a Galera node, we connect to node #2 in order to run include/galera_cluster.inc
---connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2
 --source include/galera_cluster.inc
 
---connection node_1
-SET GLOBAL wsrep_on=OFF;
-RESET MASTER;
-SET GLOBAL wsrep_on=ON;
-
+# As node #3 is not a Galera node, and galera_cluster.inc does not open connetion to it
+# we open the node_3 connection here
 --connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3
---connection node_3
+SELECT @@wsrep_on;
 RESET MASTER;
 
---connection node_2
-SET global wsrep_on=OFF;
-RESET MASTER;
-SET global wsrep_on=ON;
+--connection node_1
+# make sure gtid_slave_pos is of innodb engine, mtr does not currently provide that
+ALTER TABLE mysql.gtid_slave_pos engine = InnoDB;
 
---connection node_2
+--connection node_1
 --disable_query_log
---eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$NODE_MYPORT_1;
+--eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3;
 --enable_query_log
-START SLAVE USER='root';
+START SLAVE;
 
---connection node_1
+--connection node_3
 CREATE SCHEMA test1;
 CREATE SCHEMA test2;
 USE test1;
@@ -45,7 +38,7 @@ INSERT INTO test2.t1 (f1) VALUES (1);
 INSERT INTO test1.t1 (f1) VALUES (2);
 INSERT INTO test2.t1 (f1) VALUES (2);
 
---connection node_2
+--connection node_1
 --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
 --source include/wait_condition.inc
 
@@ -54,7 +47,7 @@ INSERT INTO test2.t1 (f1) VALUES (2);
 
 SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
 
---connection node_1
+--connection node_3
 INSERT INTO test1.t1 (f1) VALUES (3);
 INSERT INTO test2.t1 (f1) VALUES (3);
 INSERT INTO test1.t1 (f1) VALUES (3);
@@ -64,7 +57,7 @@ INSERT INTO test2.t1 (f1) VALUES (3);
 INSERT INTO test1.t1 (f1) VALUES (3);
 INSERT INTO test2.t1 (f1) VALUES (3);
 
---connection node_2
+--connection node_1
 SET SESSION wsrep_on=OFF;
 --let $wait_condition = SELECT VARIABLE_VALUE = 'non-Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE variable_name = 'wsrep_cluster_status';
 --source include/wait_condition.inc
@@ -72,7 +65,7 @@ SET SESSION wsrep_on=OFF;
 --let $slave_sql_errno = 1047
 --source include/wait_for_slave_sql_error.inc
 
---connection node_1
+--connection node_3
 INSERT INTO test1.t1 (f1) VALUES (4);
 INSERT INTO test2.t1 (f1) VALUES (4);
 INSERT INTO test1.t1 (f1) VALUES (4);
@@ -84,57 +77,51 @@ INSERT INTO test2.t1 (f1) VALUES (4);
 INSERT INTO test1.t1 (f1) VALUES (4);
 INSERT INTO test2.t1 (f1) VALUES (4);
 
---connection node_2
+--connection node_1
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
 
---connection node_1
+--connection node_3
 INSERT INTO test1.t1 (f1) VALUES (5);
 INSERT INTO test2.t1 (f1) VALUES (5);
 
---connection node_2
+--connection node_1
 --let $wait_condition = SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE variable_name = 'wsrep_cluster_status';
 --source include/wait_condition.inc
 SET SESSION wsrep_on=ON;
 --let $wait_condition = SELECT VARIABLE_VALUE = 'ON' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE variable_name = 'wsrep_ready';
 --source include/wait_condition.inc
 
---connection node_1
+--connection node_3
 INSERT INTO test1.t1 (f1) VALUES (6);
 INSERT INTO test2.t1 (f1) VALUES (6);
 
---connection node_2
+--connection node_1
 START SLAVE;
 
 #
 # Consistency checks
 #
 
---sleep 2
---connection node_2
+--connection node_1
 --let $wait_condition = SELECT COUNT(DISTINCT f1) = 6 FROM test1.t1;
 --source include/wait_condition.inc
 
---connection node_3
+--connection node_2
 --let $wait_condition = SELECT COUNT(DISTINCT f1) = 6 FROM test1.t1;
 --source include/wait_condition.inc
 
---connection node_2
---let $gtid_executed_node2 = `SELECT @@global.gtid_executed;`
-
---let $effective_uuid_1 = `SELECT SUBSTRING_INDEX(@@global.gtid_executed, ':', 1)`
---let $effective_uuid_2 = `SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(@@global.gtid_executed, '\n', -1), ':', 1)`
-
---replace_result $effective_uuid_1 <effective_uuid_1> $effective_uuid_2 <effective_uuid_2>
---replace_regex /xid=[0-9]+/xid=###/ /table_id: [0-9]+/table_id: ###/
-SHOW BINLOG EVENTS IN 'mysqld-bin.000001' FROM 120;
+--connection node_1
+SELECT LENGTH(@@global.gtid_binlog_state) > 1;
+SELECT @@global.gtid_binlog_state;
+--let $gtid_binlog_state_node1 = `SELECT @@global.gtid_binlog_state;`
 
 --error 1049
 USE test2;
 
 --connection node_3
-
+SELECT @@global.gtid_binlog_state;
 --disable_query_log
---eval SELECT '$gtid_executed_node2' = @@global.gtid_executed AS gtid_executed_equal;
+--eval SELECT '$gtid_binlog_state_node1' = @@global.gtid_binlog_state AS gtid_binlog_state_equal;
 --enable_query_log
 
 --error 1049
@@ -148,13 +135,11 @@ SHOW BINLOG EVENTS IN 'mysqld-bin.000001' FROM 120;
 # Cleanup
 #
 
---connection node_1
+--connection node_3
 DROP SCHEMA test1;
 DROP SCHEMA test2;
 
---sleep 1
-
---connection node_3
+--connection node_1
 --let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
 --source include/wait_condition.inc
 
@@ -162,7 +147,7 @@ DROP SCHEMA test2;
 --let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
 --source include/wait_condition.inc
 
---connection node_2
+--connection node_1
 STOP SLAVE;
 RESET SLAVE ALL;
 CALL mtr.add_suppression("GTID replication failed");