MDEV-35951 : Complete freeze during MW-329 test

Better to use KILL HARD and wait until connection is
really gone.

Author: janlindstrom

mysql-test/suite/galera/disabled.def

@@ -12,7 +12,6 @@
 
 galera_wan : MDEV-35940 Unallowed state transition: donor -> synced in galera_wan
 galera_vote_rejoin_ddl : MDEV-35940 Unallowed state transition: donor -> synced in galera_wan
-MW-329 : MDEV-35951 Complete freeze during MW-329 test
 galera_vote_rejoin_dml : MDEV-35964 Assertion `ist_seqno >= cc_seqno' failed in galera_vote_rejoin_dml
 galera_var_notify_cmd : MDEV-37257 WSREP: Notification command failed: 1 (Operation not permitted)
 galera_var_notify_ssl_ipv6 : MDEV-37257 WSREP: Notification command failed: 1 (Operation not permitted)

mysql-test/suite/galera/r/MW-329.result

@@ -14,10 +14,11 @@ END|
 connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1;
 connection node_1b;
 connection node_1;
+connect node_1c, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+connection node_1c;
 connection node_1b;
 connection node_1;
 DROP PROCEDURE proc_insert;
 DROP TABLE t1;
 disconnect node_1b;
-CALL mtr.add_suppression("WSREP: .* conflict state after post commit ");
-set global innodb_status_output=Default;
+disconnect node_1c;

mysql-test/suite/galera/t/MW-329.test

@@ -83,7 +83,19 @@ while ($count)
 
 --connection node_1
 --disable_query_log
---eval KILL CONNECTION $connection_id
+--eval KILL HARD CONNECTION $connection_id
+--enable_query_log
+--connect node_1c, 127.0.0.1, root, , test, $NODE_MYPORT_1
+--connection node_1c
+
+--disable_query_log
+# Make sure connection is killed
+while (`SELECT COUNT(*) > 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = $connection_id`)
+{
+  SELECT SLEEP(1);
+--error 0,ER_NO_SUCH_THREAD,ER_QUERY_INTERRUPTED,ER_CONNECTION_KILLED
+--eval KILL HARD CONNECTION $connection_id
+}
 --enable_query_log
 
 #
@@ -101,8 +113,4 @@ DROP PROCEDURE proc_insert;
 DROP TABLE t1;
 
 --disconnect node_1b
-
-# Due to MW-330, Multiple "conflict state 3 after post commit" warnings if table is dropped while SP is running
-CALL mtr.add_suppression("WSREP: .* conflict state after post commit ");
-
-set global innodb_status_output=Default;
+--disconnect node_1c