MDEV-13678: DELETE with CASCADE takes a long time when Galera is enabled

Ported fix from mysql-wsrep-bugs with some refactoring.

Test case is MW-402 where MariaDB needs record as there is
extra connection <con_name> lines.

1 files changed, 50 insertions, 0 deletions

diff --git a/mysql-test/suite/galera/r/MW-402.result b/mysql-test/suite/galera/r/MW-402.result
index 4261bc6bac3..81d6f1a555e 100644
--- a/mysql-test/suite/galera/r/MW-402.result
+++ b/mysql-test/suite/galera/r/MW-402.result
@@ -1,26 +1,37 @@
+connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
+connection node_1;
 CREATE TABLE p (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB;
 CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id INTEGER, f2 INTEGER,
 CONSTRAINT fk_1 FOREIGN KEY (p_id) REFERENCES p (f1) ON DELETE CASCADE);
 INSERT INTO p VALUES (1, 0);
 INSERT INTO p VALUES (2, 0);
 INSERT INTO c VALUES (1, 1, 0);
+connection node_1a;
+connection node_1;
 SET AUTOCOMMIT=ON;
 START TRANSACTION;
 UPDATE c SET f2=1 where f1=1;
+connection node_1a;
 SET SESSION wsrep_sync_wait = 0;
 SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync';
+connection node_2;
 DELETE FROM p WHERE f1 = 1;
+connection node_1a;
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 1;
 SET GLOBAL wsrep_provider_options = 'dbug=';
 SET GLOBAL wsrep_provider_options = 'dbug=d,local_monitor_enter_sync';
+connection node_1;
 COMMIT;
+connection node_1a;
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 1;
 SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
 SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync';
 SET GLOBAL wsrep_provider_options = 'dbug=';
+connection node_1;
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+connection node_2;
 SELECT * FROM p;
 f1	f2
 2	0
@@ -28,29 +39,39 @@ SELECT * FROM c;
 f1	p_id	f2
 DROP TABLE c;
 DROP TABLE p;
+connection node_1;
 CREATE TABLE p (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB;
 CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id INTEGER, f2 INTEGER,
 CONSTRAINT fk_1 FOREIGN KEY (p_id) REFERENCES p (f1) ON UPDATE CASCADE);
 INSERT INTO p VALUES (1, 0);
 INSERT INTO p VALUES (2, 0);
 INSERT INTO c VALUES (1, 1, 0);
+connection node_1a;
+connection node_1;
 SET AUTOCOMMIT=ON;
 START TRANSACTION;
 UPDATE c SET f2=2 where f1=1;
+connection node_1a;
 SET SESSION wsrep_sync_wait = 0;
 SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync';
+connection node_2;
 UPDATE p set f1=11 WHERE f1 = 1;
+connection node_1a;
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 1;
 SET GLOBAL wsrep_provider_options = 'dbug=';
 SET GLOBAL wsrep_provider_options = 'dbug=d,local_monitor_enter_sync';
+connection node_1;
 COMMIT;
+connection node_1a;
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 1;
 SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
 SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync';
 SET GLOBAL wsrep_provider_options = 'dbug=';
+connection node_1;
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+connection node_2;
 SELECT * FROM p;
 f1	f2
 2	0
@@ -60,29 +81,39 @@ f1	p_id	f2
 1	11	0
 DROP TABLE c;
 DROP TABLE p;
+connection node_1;
 CREATE TABLE p (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB;
 CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id INTEGER, f2 INTEGER,
 CONSTRAINT fk_1 FOREIGN KEY (p_id) REFERENCES p (f1) ON UPDATE CASCADE);
 INSERT INTO p VALUES (1, 0);
 INSERT INTO p VALUES (2, 0);
 INSERT INTO c VALUES (1, 1, 0);
+connection node_1a;
+connection node_1;
 SET AUTOCOMMIT=ON;
 START TRANSACTION;
 UPDATE c SET p_id=2 where f1=1;
+connection node_1a;
 SET SESSION wsrep_sync_wait = 0;
 SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync';
+connection node_2;
 UPDATE p set f1=11 WHERE f1 = 1;
+connection node_1a;
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 1;
 SET GLOBAL wsrep_provider_options = 'dbug=';
 SET GLOBAL wsrep_provider_options = 'dbug=d,local_monitor_enter_sync';
+connection node_1;
 COMMIT;
+connection node_1a;
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 1;
 SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
 SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync';
 SET GLOBAL wsrep_provider_options = 'dbug=';
+connection node_1;
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+connection node_2;
 SELECT * FROM p;
 f1	f2
 2	0
@@ -90,23 +121,32 @@ f1	f2
 SELECT * FROM c;
 f1	p_id	f2
 1	11	0
+connection node_1a;
+connection node_1;
 SET AUTOCOMMIT=ON;
 START TRANSACTION;
 UPDATE p set f1=21 WHERE f1 = 11;
+connection node_1a;
 SET SESSION wsrep_sync_wait = 0;
 SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync';
+connection node_2;
 UPDATE c SET p_id=2 where f1=1;
+connection node_1a;
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 1;
 SET GLOBAL wsrep_provider_options = 'dbug=';
 SET GLOBAL wsrep_provider_options = 'dbug=d,local_monitor_enter_sync';
+connection node_1;
 COMMIT;
+connection node_1a;
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 1;
 SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
 SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync';
 SET GLOBAL wsrep_provider_options = 'dbug=';
+connection node_1;
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+connection node_2;
 SELECT * FROM p;
 f1	f2
 2	0
@@ -116,6 +156,7 @@ f1	p_id	f2
 1	2	0
 DROP TABLE c;
 DROP TABLE p;
+connection node_1;
 CREATE TABLE p1 (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB;
 CREATE TABLE p2 (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB;
 CREATE TABLE c (f1 INTEGER PRIMARY KEY, p1_id INTEGER, p2_id INTEGER, f2 INTEGER,
@@ -124,22 +165,31 @@ CONSTRAINT fk_2 FOREIGN KEY (p2_id) REFERENCES p2 (f1));
 INSERT INTO p1 VALUES (1, 0);
 INSERT INTO p2 VALUES (1, 0);
 INSERT INTO c VALUES (1, 1, 1, 0);
+connection node_1a;
+connection node_1;
 SET AUTOCOMMIT=ON;
 START TRANSACTION;
 UPDATE p2 SET f2=2 where f1=1;
+connection node_1a;
 SET SESSION wsrep_sync_wait = 0;
 SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync';
+connection node_2;
 DELETE FROM p1 WHERE f1 = 1;
+connection node_1a;
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 1;
 SET GLOBAL wsrep_provider_options = 'dbug=';
 SET GLOBAL wsrep_provider_options = 'dbug=d,local_monitor_enter_sync';
+connection node_1;
 COMMIT;
+connection node_1a;
 SET SESSION wsrep_on = 0;
 SET SESSION wsrep_on = 1;
 SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
 SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync';
 SET GLOBAL wsrep_provider_options = 'dbug=';
+connection node_1;
+connection node_2;
 SELECT * FROM p1;
 f1	f2
 SELECT * FROM p2;