database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Use separate connection for START SLAVE in rpl_deadlock.test

Browse Source 
START SLAVE is documented to implicitly commit any active transaction.
So do this in a separate connection, to not break the lock on which
the test case depends.

Found during MDEV-12179 development, but independent of this, so done
in a separate commit.
This commit is contained in:
Kristian Nielsen
2017-04-20 16:07:27 +02:00
parent fdf2d40770
commit da9decdccf
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/extra/rpl_tests/rpl_deadlock.test
View File

@@ -46,6 +46,9 @@ BEGIN;
SELECT * FROM t1 FOR UPDATE; SELECT * FROM t1 FOR UPDATE;
# Save variable 'Slave_retried_transactions' before deadlock # Save variable 'Slave_retried_transactions' before deadlock
let $slave_retried_transactions= query_get_value(SHOW GLOBAL STATUS LIKE 'Slave_retried_transactions', Value, 1); let $slave_retried_transactions= query_get_value(SHOW GLOBAL STATUS LIKE 'Slave_retried_transactions', Value, 1);
# Run the START SLAVE in a separate connection. Otherwise it terminates
# the SELECT FOR UPDATE transaction (START SLAVE does implicit COMMIT!).
connection slave1;
START SLAVE; START SLAVE;
# Wait until SQL thread blocked: variable 'Slave_retried_transactions' will incremented # Wait until SQL thread blocked: variable 'Slave_retried_transactions' will incremented
let $status_var= Slave_retried_transactions; let $status_var= Slave_retried_transactions;
@@ -53,6 +56,7 @@ let $status_var_value= $slave_retried_transactions;
let $status_type= GLOBAL; let $status_type= GLOBAL;
let $status_var_comparsion= >; let $status_var_comparsion= >;
--source include/wait_for_status_var.inc --source include/wait_for_status_var.inc
connection slave;
SELECT COUNT(*) FROM t2; SELECT COUNT(*) FROM t2;
COMMIT; COMMIT;
sync_with_master; sync_with_master;
@@ -78,9 +82,11 @@ BEGIN;
# Hold lock # Hold lock
SELECT * FROM t1 FOR UPDATE; SELECT * FROM t1 FOR UPDATE;
# Wait until slave stopped with error 'Lock wait timeout exceeded' # Wait until slave stopped with error 'Lock wait timeout exceeded'
connection slave1;
START SLAVE; START SLAVE;
let $slave_sql_errno= 1205; let $slave_sql_errno= 1205;
--source include/wait_for_slave_sql_error.inc --source include/wait_for_slave_sql_error.inc
connection slave;
SELECT COUNT(*) FROM t2; SELECT COUNT(*) FROM t2;
COMMIT; COMMIT;
--source include/start_slave.inc --source include/start_slave.inc
@@ -109,9 +115,11 @@ BEGIN;
# Hold lock # Hold lock
SELECT * FROM t1 FOR UPDATE; SELECT * FROM t1 FOR UPDATE;
# Wait until slave stopped with error 'Lock wait timeout exceeded' # Wait until slave stopped with error 'Lock wait timeout exceeded'
connection slave1;
START SLAVE; START SLAVE;
let $slave_sql_errno= 1205; let $slave_sql_errno= 1205;
--source include/wait_for_slave_sql_error.inc --source include/wait_for_slave_sql_error.inc
connection slave;
SELECT COUNT(*) FROM t2; SELECT COUNT(*) FROM t2;
COMMIT; COMMIT;
--source include/start_slave.inc --source include/start_slave.inc

6
mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
View File

@@ -39,7 +39,9 @@ connection slave;
BEGIN; BEGIN;
SELECT * FROM t1 FOR UPDATE; SELECT * FROM t1 FOR UPDATE;
a a
connection slave1;
START SLAVE; START SLAVE;
connection slave;
SELECT COUNT(*) FROM t2; SELECT COUNT(*) FROM t2;
COUNT(*) COUNT(*)
0 0
@@ -61,8 +63,10 @@ BEGIN;
SELECT * FROM t1 FOR UPDATE; SELECT * FROM t1 FOR UPDATE;
a a
1 1
connection slave1;
START SLAVE; START SLAVE;
include/wait_for_slave_sql_error.inc [errno=1205] include/wait_for_slave_sql_error.inc [errno=1205]
connection slave;
SELECT COUNT(*) FROM t2; SELECT COUNT(*) FROM t2;
COUNT(*) COUNT(*)
0 0
@@ -92,8 +96,10 @@ SELECT * FROM t1 FOR UPDATE;
a a
1 1
1 1
connection slave1;
START SLAVE; START SLAVE;
include/wait_for_slave_sql_error.inc [errno=1205] include/wait_for_slave_sql_error.inc [errno=1205]
connection slave;
SELECT COUNT(*) FROM t2; SELECT COUNT(*) FROM t2;
COUNT(*) COUNT(*)
0 0