MDEV-20886 galera.MDEV-20225

Fix test MDEV-20225.

mysql-test/suite/galera/disabled.def

@@ -12,7 +12,6 @@
 
 GCF-1081 : MDEV-18283 Galera test failure on galera.GCF-1081
 GCF-939 : MDEV-21520 galera.GCF-939
-MDEV-20225 : MDEV-20886 galera.MDEV-20225
 MW-328A : MDEV-22666 galera.MW-328A MTR failed: "Semaphore wait has lasted > 600 seconds" and do not release port 16002
 MW-328B : MDEV-22666 galera.MW-328A MTR failed: "Semaphore wait has lasted > 600 seconds" and do not release port 16002
 MW-329 : MDEV-19962 Galera test failure on MW-329

mysql-test/suite/galera/r/MDEV-20225.result

@@ -11,11 +11,12 @@ DROP TRIGGER tr1;
 connection node_2;
 connection node_1;
 INSERT INTO t1 VALUES (NULL);
-connection node_2;
+connection node_2a;
 SET GLOBAL debug_dbug = 'RESET';
 SET DEBUG_SYNC = 'now SIGNAL signal.mdev_20225_continue';
 SET DEBUG_SYNC = 'RESET';
 SET GLOBAL wsrep_slave_threads = 1;
+connection node_2;
 SHOW TRIGGERS;
 Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
 DROP TABLE t1;

mysql-test/suite/galera/t/MDEV-20225.test

@@ -34,12 +34,16 @@ INSERT INTO t1 VALUES (NULL);
 # so there is no sync point or condition to wait.
 --sleep 1
 
---connection node_2
+--let $galera_connection_name = node_2a
+--let $galera_server_number = 2
+--source include/galera_connect.inc
+--connection node_2a
 SET GLOBAL debug_dbug = 'RESET';
 SET DEBUG_SYNC = 'now SIGNAL signal.mdev_20225_continue';
 SET DEBUG_SYNC = 'RESET';
 SET GLOBAL wsrep_slave_threads = 1;
 
+--connection node_2
 # Trigger should now be dropped on node_2.
 --let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TRIGGERS WHERE TRIGGER_NAME like '%tr1'
 --source include/wait_condition.inc