mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Merge 10.4 into 10.5
This commit is contained in:
Marko Mäkelä
114
mysql-test/suite/galera/r/MDEV-20616.result
Normal file
114
mysql-test/suite/galera/r/MDEV-20616.result
Normal file
@@ -0,0 +1,114 @@
|
||||
connection node_2;
|
||||
connection node_1;
|
||||
|
||||
Test phase 1 to make sure that natral deadlock in trigger SP execution is
|
||||
handled correctly
|
||||
|
||||
CREATE TABLE t1(a INT);
|
||||
CREATE TABLE t2(f1 INT, f2 INT, f3 INT);
|
||||
CREATE PROCEDURE proc()
|
||||
BEGIN
|
||||
INSERT INTO t2 VALUES(100, 200, 300);
|
||||
UPDATE t2 SET f3 = f3 + 100;
|
||||
END|
|
||||
CREATE TRIGGER t1 BEFORE INSERT ON t1 FOR EACH ROW CALL proc();
|
||||
INSERT INTO t1 VALUES(2);;
|
||||
connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
|
||||
INSERT INTO t1 VALUES(1);;
|
||||
connection node_1;
|
||||
connection node_1a;
|
||||
connection node_1;
|
||||
wsrep__bf_aborts
|
||||
0
|
||||
DROP TABLE t1;
|
||||
DROP TABLE t2;
|
||||
DROP PROCEDURE proc;
|
||||
|
||||
Test phase 2 to make sure that BF abort for SP execution is
|
||||
handled correctly
|
||||
|
||||
connection node_1;
|
||||
SET SESSION wsrep_retry_autocommit = 0;
|
||||
SET SESSION wsrep_sync_wait = 0;
|
||||
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1));
|
||||
connection node_1a;
|
||||
SET SESSION wsrep_retry_autocommit = 0;
|
||||
SET SESSION wsrep_sync_wait = 0;
|
||||
CREATE PROCEDURE proc_update()
|
||||
BEGIN
|
||||
UPDATE t1 SET f2 = 'b';
|
||||
END|
|
||||
INSERT INTO t1 VALUES(1, 'a');
|
||||
connection node_1;
|
||||
SET debug_sync='wsrep_before_certification SIGNAL ready WAIT_FOR cont';
|
||||
CALL proc_update;
|
||||
connection node_1a;
|
||||
SET debug_sync='now WAIT_FOR ready';
|
||||
connection node_2;
|
||||
UPDATE t1 SET f2='c';
|
||||
connection node_1a;
|
||||
SET debug_sync='now SIGNAL cont';
|
||||
connection node_1;
|
||||
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
|
||||
connection node_1a;
|
||||
SET debug_sync='RESET';
|
||||
DROP PROCEDURE proc_update;
|
||||
connection node_1;
|
||||
|
||||
Test phase 3 to make sure natural deadlock is not treated as BF abort
|
||||
|
||||
TRUNCATE t1;
|
||||
INSERT INTO t1 VALUES (1, 'a'), (2, 'a');
|
||||
connection node_1a;
|
||||
START TRANSACTION;
|
||||
UPDATE t1 SET f2 = 'b' WHERE f1 = 1;
|
||||
connection node_1;
|
||||
START TRANSACTION;
|
||||
UPDATE t1 SET f2 = 'c' WHERE f1 = 2;
|
||||
connection node_1a;
|
||||
UPDATE t1 SET f2 = 'b' WHERE f1 = 2;
|
||||
connection node_1;
|
||||
UPDATE t1 SET f2 = 'c' WHERE f1 = 1;
|
||||
connection node_1a;
|
||||
COMMIT;
|
||||
wsrep__bf_aborts
|
||||
0
|
||||
connection node_1;
|
||||
ROLLBACK;
|
||||
|
||||
Test phase 4 to make sure natural deadlock inside SP execution
|
||||
is not treated as BF abort
|
||||
|
||||
connection node_1a;
|
||||
TRUNCATE t1;
|
||||
INSERT INTO t1 VALUES (1, 'a'), (2, 'a');
|
||||
CREATE PROCEDURE proc_update_1()
|
||||
BEGIN
|
||||
START TRANSACTION;
|
||||
UPDATE t1 SET f2 = 'b' WHERE f1 = 1;
|
||||
SELECT SLEEP(5);
|
||||
UPDATE t1 SET f2 = 'b' WHERE f1 = 2;
|
||||
COMMIT;
|
||||
END|
|
||||
CREATE PROCEDURE proc_update_2()
|
||||
BEGIN
|
||||
START TRANSACTION;
|
||||
UPDATE t1 SET f2 = 'c' WHERE f1 = 2;
|
||||
SELECT SLEEP(5);
|
||||
UPDATE t1 SET f2 = 'c' WHERE f1 = 1;
|
||||
COMMIT;
|
||||
END|
|
||||
connection node_1;
|
||||
CALL proc_update_1;
|
||||
connection node_1a;
|
||||
CALL proc_update_2;
|
||||
SLEEP(5)
|
||||
0
|
||||
wsrep__bf_aborts
|
||||
0
|
||||
connection node_1;
|
||||
SLEEP(5)
|
||||
0
|
||||
DROP PROCEDURE proc_update_1;
|
||||
DROP PROCEDURE proc_update_2;
|
||||
DROP TABLE t1;
|
||||
73
mysql-test/suite/galera/r/galera_multirow_rollback.result
Normal file
73
mysql-test/suite/galera/r/galera_multirow_rollback.result
Normal file
@@ -0,0 +1,73 @@
|
||||
connection node_2;
|
||||
connection node_1;
|
||||
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY DEFAULT 0, f2 char(12));
|
||||
connection node_1;
|
||||
START TRANSACTION;
|
||||
INSERT INTO t1 (f2) VALUES ('a'), ('b');
|
||||
ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
|
||||
COMMIT;
|
||||
SELECT COUNT(*) AS expect_0 FROM t1;
|
||||
expect_0
|
||||
0
|
||||
connection node_2;
|
||||
SELECT COUNT(*) AS expect_0 FROM t1;
|
||||
expect_0
|
||||
0
|
||||
DROP TABLE t1;
|
||||
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY DEFAULT 0, f2 char(12));
|
||||
connection node_1;
|
||||
START TRANSACTION;
|
||||
INSERT INTO t1 VALUES (1, 'a');
|
||||
INSERT INTO t1 VALUES (2, 'b');
|
||||
INSERT INTO t1 (f2) VALUES ('c'), ('d');
|
||||
ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
|
||||
COMMIT;
|
||||
expect (1,'a'), (2, 'b')
|
||||
SELECT * FROM t1;
|
||||
f1 f2
|
||||
1 a
|
||||
2 b
|
||||
connection node_2;
|
||||
expect (1,'a'), (2, 'b')
|
||||
SELECT * FROM t1;
|
||||
f1 f2
|
||||
1 a
|
||||
2 b
|
||||
DROP TABLE t1;
|
||||
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY DEFAULT 0, f2 char(12));
|
||||
connection node_1;
|
||||
INSERT INTO t1 (f2) VALUES ('a'),('b');
|
||||
ERROR 23000: Duplicate entry '0' for key 'PRIMARY'
|
||||
SELECT COUNT(*) AS expect_0 FROM t1;
|
||||
expect_0
|
||||
0
|
||||
connection node_2;
|
||||
SELECT COUNT(*) AS expect_0 FROM t1;
|
||||
expect_0
|
||||
0
|
||||
DROP TABLE t1;
|
||||
connection node_1;
|
||||
CREATE TABLE p(id int primary key, j int) ENGINE=InnoDB;
|
||||
CREATE TABLE c(id int primary key, fk1 int) ENGINE=InnoDB;
|
||||
ALTER TABLE c ADD FOREIGN KEY (fk1) references p(id);
|
||||
INSERT INTO p VALUES(1, 0);
|
||||
START TRANSACTION;
|
||||
INSERT INTO c VALUES (3,1);
|
||||
INSERT INTO c VALUES (1,1), (2,2);
|
||||
ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`c`, CONSTRAINT `c_ibfk_1` FOREIGN KEY (`fk1`) REFERENCES `p` (`id`))
|
||||
COMMIT;
|
||||
SELECT * FROM p;
|
||||
id j
|
||||
1 0
|
||||
SELECT * FROM c;
|
||||
id fk1
|
||||
3 1
|
||||
connection node_2;
|
||||
SELECT * FROM p;
|
||||
id j
|
||||
1 0
|
||||
SELECT * FROM c;
|
||||
id fk1
|
||||
3 1
|
||||
DROP TABLE c;
|
||||
DROP TABLE p;
|
||||
@@ -41,6 +41,8 @@ SET DEBUG_SYNC = 'RESET';
|
||||
SET GLOBAL wsrep_slave_threads = 1;
|
||||
|
||||
# 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
|
||||
SHOW TRIGGERS;
|
||||
|
||||
DROP TABLE t1;
|
||||
|
||||
244
mysql-test/suite/galera/t/MDEV-20616.test
Normal file
244
mysql-test/suite/galera/t/MDEV-20616.test
Normal file
@@ -0,0 +1,244 @@
|
||||
#
|
||||
# Test different deadlock scenarios in innodb and make sure that
|
||||
# wsrep patch does not handle them as BF aborts.
|
||||
#
|
||||
|
||||
--source include/galera_cluster.inc
|
||||
--source include/have_debug.inc
|
||||
--source include/have_debug_sync.inc
|
||||
|
||||
##############################################################################
|
||||
# test case to verify that natural deadlock of trigger SP execution is
|
||||
# handled correctly
|
||||
##############################################################################
|
||||
|
||||
--echo
|
||||
--echo Test phase 1 to make sure that natral deadlock in trigger SP execution is
|
||||
--echo handled correctly
|
||||
--echo
|
||||
--let $aborts_old = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_bf_aborts'`
|
||||
|
||||
CREATE TABLE t1(a INT);
|
||||
CREATE TABLE t2(f1 INT, f2 INT, f3 INT);
|
||||
--disable_query_log
|
||||
let $run=1000;
|
||||
while($run)
|
||||
{
|
||||
INSERT INTO t2 VALUES (1, 2, 3);
|
||||
dec $run;
|
||||
}
|
||||
--enable_query_log
|
||||
|
||||
DELIMITER |;
|
||||
CREATE PROCEDURE proc()
|
||||
BEGIN
|
||||
INSERT INTO t2 VALUES(100, 200, 300);
|
||||
UPDATE t2 SET f3 = f3 + 100;
|
||||
END|
|
||||
DELIMITER ;|
|
||||
|
||||
CREATE TRIGGER t1 BEFORE INSERT ON t1 FOR EACH ROW CALL proc();
|
||||
|
||||
--send INSERT INTO t1 VALUES(2);
|
||||
|
||||
--connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1
|
||||
--send INSERT INTO t1 VALUES(1);
|
||||
|
||||
--connection node_1
|
||||
--error 0,ER_LOCK_DEADLOCK
|
||||
--reap
|
||||
|
||||
--connection node_1a
|
||||
--error 0,ER_LOCK_DEADLOCK
|
||||
--reap
|
||||
|
||||
--connection node_1
|
||||
--let $aborts_new = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_bf_aborts'`
|
||||
--disable_query_log
|
||||
--eval SELECT $aborts_new - $aborts_old AS wsrep__bf_aborts;
|
||||
--enable_query_log
|
||||
DROP TABLE t1;
|
||||
DROP TABLE t2;
|
||||
DROP PROCEDURE proc;
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# test case to verify that BF abort for SP execution is handled correctly
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
--echo
|
||||
--echo Test phase 2 to make sure that BF abort for SP execution is
|
||||
--echo handled correctly
|
||||
--echo
|
||||
--connection node_1
|
||||
SET SESSION wsrep_retry_autocommit = 0;
|
||||
SET SESSION wsrep_sync_wait = 0;
|
||||
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 CHAR(1));
|
||||
|
||||
# Control connection for Galera sync point management
|
||||
--connection node_1a
|
||||
|
||||
SET SESSION wsrep_retry_autocommit = 0;
|
||||
SET SESSION wsrep_sync_wait = 0;
|
||||
--let $aborts_old = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_bf_aborts'`
|
||||
|
||||
DELIMITER |;
|
||||
CREATE PROCEDURE proc_update()
|
||||
BEGIN
|
||||
UPDATE t1 SET f2 = 'b';
|
||||
END|
|
||||
DELIMITER ;|
|
||||
|
||||
INSERT INTO t1 VALUES(1, 'a');
|
||||
|
||||
--connection node_1
|
||||
SET debug_sync='wsrep_before_certification SIGNAL ready WAIT_FOR cont';
|
||||
--send CALL proc_update
|
||||
|
||||
--connection node_1a
|
||||
SET debug_sync='now WAIT_FOR ready';
|
||||
|
||||
--connection node_2
|
||||
UPDATE t1 SET f2='c';
|
||||
|
||||
--connection node_1a
|
||||
# wait for BF to happen
|
||||
--let $wait_condition = SELECT VARIABLE_VALUE = $aborts_old + 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_bf_aborts'
|
||||
--source include/wait_condition.inc
|
||||
|
||||
SET debug_sync='now SIGNAL cont';
|
||||
|
||||
--connection node_1
|
||||
--error ER_LOCK_DEADLOCK
|
||||
--reap
|
||||
|
||||
--connection node_1a
|
||||
SET debug_sync='RESET';
|
||||
|
||||
DROP PROCEDURE proc_update;
|
||||
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# test case to verify that natural deadlock does not cause BF abort
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
--connection node_1
|
||||
--echo
|
||||
--echo Test phase 3 to make sure natural deadlock is not treated as BF abort
|
||||
--echo
|
||||
TRUNCATE t1;
|
||||
INSERT INTO t1 VALUES (1, 'a'), (2, 'a');
|
||||
|
||||
--connection node_1a
|
||||
--let $aborts_old = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_bf_aborts'`
|
||||
|
||||
START TRANSACTION;
|
||||
UPDATE t1 SET f2 = 'b' WHERE f1 = 1;
|
||||
|
||||
--connection node_1
|
||||
START TRANSACTION;
|
||||
UPDATE t1 SET f2 = 'c' WHERE f1 = 2;
|
||||
|
||||
--connection node_1a
|
||||
# this hangs for lock wait
|
||||
--send UPDATE t1 SET f2 = 'b' WHERE f1 = 2
|
||||
|
||||
#
|
||||
# classic deadlock happens here
|
||||
#
|
||||
--connection node_1
|
||||
--error 0, ER_LOCK_DEADLOCK
|
||||
UPDATE t1 SET f2 = 'c' WHERE f1 = 1;
|
||||
|
||||
--connection node_1a
|
||||
--error 0, ER_LOCK_DEADLOCK
|
||||
--reap
|
||||
COMMIT;
|
||||
|
||||
#
|
||||
# either one of SP executions was aborted because of natural deadlock, or in worst case
|
||||
# they were ordered seqeuntailly, and both succeeded.
|
||||
# anyways, we just check here that no BF aborts happened
|
||||
#
|
||||
--let $aborts_new = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_bf_aborts'`
|
||||
--disable_query_log
|
||||
--eval SELECT $aborts_new - $aborts_old AS wsrep__bf_aborts;
|
||||
--enable_query_log
|
||||
|
||||
--connection node_1
|
||||
ROLLBACK;
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# test case to verify that natural deadlock within SP exceution
|
||||
# does not cause BF abort
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
--echo
|
||||
--echo Test phase 4 to make sure natural deadlock inside SP execution
|
||||
--echo is not treated as BF abort
|
||||
--echo
|
||||
|
||||
--connection node_1a
|
||||
TRUNCATE t1;
|
||||
INSERT INTO t1 VALUES (1, 'a'), (2, 'a');
|
||||
|
||||
--let $aborts_old = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_bf_aborts'`
|
||||
|
||||
DELIMITER |;
|
||||
CREATE PROCEDURE proc_update_1()
|
||||
BEGIN
|
||||
START TRANSACTION;
|
||||
UPDATE t1 SET f2 = 'b' WHERE f1 = 1;
|
||||
SELECT SLEEP(5);
|
||||
UPDATE t1 SET f2 = 'b' WHERE f1 = 2;
|
||||
COMMIT;
|
||||
END|
|
||||
DELIMITER ;|
|
||||
|
||||
DELIMITER |;
|
||||
CREATE PROCEDURE proc_update_2()
|
||||
BEGIN
|
||||
START TRANSACTION;
|
||||
UPDATE t1 SET f2 = 'c' WHERE f1 = 2;
|
||||
SELECT SLEEP(5);
|
||||
UPDATE t1 SET f2 = 'c' WHERE f1 = 1;
|
||||
COMMIT;
|
||||
END|
|
||||
DELIMITER ;|
|
||||
|
||||
--connection node_1
|
||||
--send CALL proc_update_1
|
||||
|
||||
--connection node_1a
|
||||
#
|
||||
# calling proc_update_2 should cause a natural deadlock
|
||||
# however, this test is not deterministic, and depends on the sleep() to
|
||||
# cause expected ordering for update statement execution within SPs
|
||||
# We therefore, allow both success and deadlock error for the result
|
||||
#
|
||||
--error 0, ER_LOCK_DEADLOCK
|
||||
CALL proc_update_2;
|
||||
|
||||
#
|
||||
# either one of SP executions was aborted because of natural deadlock, or in worst case
|
||||
# they were ordered seqeuntailly, and both succeeded.
|
||||
# anyways, we just check here that no BF aborts happened
|
||||
#
|
||||
--let $aborts_new = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_bf_aborts'`
|
||||
--disable_query_log
|
||||
--eval SELECT $aborts_new - $aborts_old AS wsrep__bf_aborts;
|
||||
--enable_query_log
|
||||
|
||||
|
||||
--connection node_1
|
||||
--error 0, ER_LOCK_DEADLOCK
|
||||
--reap
|
||||
|
||||
DROP PROCEDURE proc_update_1;
|
||||
DROP PROCEDURE proc_update_2;
|
||||
DROP TABLE t1;
|
||||
@@ -0,0 +1,4 @@
|
||||
[binlogon]
|
||||
log-bin
|
||||
|
||||
[binlogoff]
|
||||
89
mysql-test/suite/galera/t/galera_multirow_rollback.test
Normal file
89
mysql-test/suite/galera/t/galera_multirow_rollback.test
Normal file
@@ -0,0 +1,89 @@
|
||||
#
|
||||
# Test multirow insert rollback
|
||||
#
|
||||
|
||||
--source include/galera_cluster.inc
|
||||
|
||||
#
|
||||
# Case 1: error on multirow insert results in empty transaction
|
||||
#
|
||||
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY DEFAULT 0, f2 char(12));
|
||||
|
||||
--connection node_1
|
||||
START TRANSACTION;
|
||||
--error ER_DUP_ENTRY
|
||||
INSERT INTO t1 (f2) VALUES ('a'), ('b');
|
||||
COMMIT;
|
||||
|
||||
SELECT COUNT(*) AS expect_0 FROM t1;
|
||||
|
||||
--connection node_2
|
||||
SELECT COUNT(*) AS expect_0 FROM t1;
|
||||
|
||||
DROP TABLE t1;
|
||||
|
||||
|
||||
#
|
||||
# Case 2: error on multirow insert does not affect previous statements
|
||||
#
|
||||
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY DEFAULT 0, f2 char(12));
|
||||
|
||||
--connection node_1
|
||||
START TRANSACTION;
|
||||
INSERT INTO t1 VALUES (1, 'a');
|
||||
INSERT INTO t1 VALUES (2, 'b');
|
||||
--error ER_DUP_ENTRY
|
||||
INSERT INTO t1 (f2) VALUES ('c'), ('d');
|
||||
COMMIT;
|
||||
|
||||
--echo expect (1,'a'), (2, 'b')
|
||||
SELECT * FROM t1;
|
||||
|
||||
--connection node_2
|
||||
--echo expect (1,'a'), (2, 'b')
|
||||
SELECT * FROM t1;
|
||||
|
||||
DROP TABLE t1;
|
||||
|
||||
|
||||
#
|
||||
# Case 3: error on autocommit multirow insert
|
||||
#
|
||||
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY DEFAULT 0, f2 char(12));
|
||||
|
||||
--connection node_1
|
||||
--error ER_DUP_ENTRY
|
||||
INSERT INTO t1 (f2) VALUES ('a'),('b');
|
||||
|
||||
SELECT COUNT(*) AS expect_0 FROM t1;
|
||||
|
||||
--connection node_2
|
||||
SELECT COUNT(*) AS expect_0 FROM t1;
|
||||
|
||||
DROP TABLE t1;
|
||||
|
||||
|
||||
#
|
||||
# Case 4: FK constraint violation on multirow insert
|
||||
#
|
||||
--connection node_1
|
||||
CREATE TABLE p(id int primary key, j int) ENGINE=InnoDB;
|
||||
CREATE TABLE c(id int primary key, fk1 int) ENGINE=InnoDB;
|
||||
ALTER TABLE c ADD FOREIGN KEY (fk1) references p(id);
|
||||
INSERT INTO p VALUES(1, 0);
|
||||
|
||||
START TRANSACTION;
|
||||
INSERT INTO c VALUES (3,1);
|
||||
--error ER_NO_REFERENCED_ROW_2
|
||||
INSERT INTO c VALUES (1,1), (2,2);
|
||||
COMMIT;
|
||||
|
||||
SELECT * FROM p;
|
||||
SELECT * FROM c;
|
||||
|
||||
--connection node_2
|
||||
SELECT * FROM p;
|
||||
SELECT * FROM c;
|
||||
|
||||
DROP TABLE c;
|
||||
DROP TABLE p;
|
||||
Reference in New Issue
Block a user