Bug#26883680 COMMIT_ORDER_MANAGER CAN'T TERMINATE MTS WORKER PROPERLY WHEN DEADLOCK HAPPENS

Pedro Figueiredo · Pedro Figueiredo · commit 586afbb06018 · 2021-02-12T16:50:12.000Z
[post-push]

Wrongly generated `.result` files in previous push.

Reviewed-by: Kapil Agrawal &lt;kapil.agrawal@oracle.com&gt;
diff --git a/mysql-test/suite/rpl/r/rpl_mts_spco_deadlock_slave_trans_retries_hang.result b/mysql-test/suite/rpl/r/rpl_mts_spco_deadlock_slave_trans_retries_hang.result
@@ -50,7 +50,7 @@ include/start_slave_sql.inc
 ROLLBACK;
 #
 # Add error supressions.
-CALL mtr.add_suppression("Worker 2 failed executing transaction 'ANONYMOUS'");
+CALL mtr.add_suppression("Worker 2 failed executing transaction.*");
 #
 # 3.2. Wait till the co-ordinator thread to error out with ER_LOCK_DEADLOCK.
 include/wait_for_slave_sql_error.inc [errno=1213]

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ include/start_slave_sql.inc`
`50`	`50`	`ROLLBACK;`
`51`	`51`	`#`
`52`	`52`	`# Add error supressions.`
`53`		`-CALL mtr.add_suppression("Worker 2 failed executing transaction 'ANONYMOUS'");`
	`53`	`+CALL mtr.add_suppression("Worker 2 failed executing transaction.*");`
`54`	`54`	`#`
`55`	`55`	`# 3.2. Wait till the co-ordinator thread to error out with ER_LOCK_DEADLOCK.`
`56`	`56`	`include/wait_for_slave_sql_error.inc [errno=1213]`