From e6acddf121ab4312a8da73b2d47fecb497b6ae33 Mon Sep 17 00:00:00 2001 From: Nikita Malyavin Date: Tue, 14 Nov 2023 11:20:49 +0100 Subject: [PATCH] main.alter_table_online_debug: fix race in XA tests --- .../main/alter_table_online_debug.result | 20 +++++++++---------- mysql-test/main/alter_table_online_debug.test | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/mysql-test/main/alter_table_online_debug.result b/mysql-test/main/alter_table_online_debug.result index 37b80fe08c4..1d20d40e7e4 100644 --- a/mysql-test/main/alter_table_online_debug.result +++ b/mysql-test/main/alter_table_online_debug.result @@ -1577,10 +1577,10 @@ xa begin 'x1'; update t set a = 2 where a = 1; xa end 'x1'; xa prepare 'x1'; -set debug_sync= 'THD_cleanup_after_trans_cleanup signal xa_detach'; +set debug_sync= 'thread_end signal xa_detach wait_for close'; disconnect con1; connection con2; -set debug_sync= 'now wait_for xa_detach'; +set debug_sync= 'now signal close wait_for xa_detach'; xa commit 'x1'; set debug_sync= 'now signal go'; connection default; @@ -1596,10 +1596,10 @@ xa begin 'x2'; insert into t values (53); xa end 'x2'; xa prepare 'x2'; -set debug_sync= 'THD_cleanup_after_trans_cleanup signal xa_detach'; +set debug_sync= 'thread_end signal xa_detach wait_for close'; disconnect con1; connection con2; -set debug_sync= 'now wait_for xa_detach'; +set debug_sync= 'now signal close wait_for xa_detach'; xa rollback 'x2'; set debug_sync= 'now signal go'; connection default; @@ -1618,11 +1618,11 @@ insert into t values (3); xa end 'xuncommitted'; xa prepare 'xuncommitted'; set debug_sync= 'now signal go'; -set debug_sync= 'THD_cleanup_after_trans_cleanup signal xa_detach'; +set debug_sync= 'thread_end signal xa_detach wait_for close'; disconnect con1; connection default; ERROR HY000: Lock wait timeout exceeded; try restarting transaction -set debug_sync= 'now wait_for xa_detach'; +set debug_sync= 'now signal close wait_for xa_detach'; xa rollback 'xuncommitted'; select * from t; a @@ -1638,11 +1638,11 @@ insert into t values (3); xa end 'committed_later'; xa prepare 'committed_later'; set debug_sync= 'now signal go'; -set debug_sync= 'THD_cleanup_after_trans_cleanup signal xa_detach'; +set debug_sync= 'thread_end signal xa_detach wait_for close'; disconnect con1; connection default; ERROR HY000: Lock wait timeout exceeded; try restarting transaction -set debug_sync= 'now wait_for xa_detach'; +set debug_sync= 'now signal close wait_for xa_detach'; xa commit 'committed_later'; select * from t; a @@ -1659,10 +1659,10 @@ ERROR 23000: Duplicate entry '3' for key 'PRIMARY' insert into t values (5); xa end 'x1'; xa prepare 'x1'; -set debug_sync= 'THD_cleanup_after_trans_cleanup signal xa_detach'; +set debug_sync= 'thread_end signal xa_detach wait_for close'; disconnect con1; connection con2; -set debug_sync= 'now wait_for xa_detach'; +set debug_sync= 'now signal close wait_for xa_detach'; xa commit 'x1'; set debug_sync= 'now signal go'; connection default; diff --git a/mysql-test/main/alter_table_online_debug.test b/mysql-test/main/alter_table_online_debug.test index 26b33af24ce..cf0062da269 100644 --- a/mysql-test/main/alter_table_online_debug.test +++ b/mysql-test/main/alter_table_online_debug.test @@ -1810,11 +1810,11 @@ xa begin 'x1'; update t set a = 2 where a = 1; xa end 'x1'; xa prepare 'x1'; -set debug_sync= 'THD_cleanup_after_trans_cleanup signal xa_detach'; +set debug_sync= 'thread_end signal xa_detach wait_for close'; --disconnect con1 --connection con2 -set debug_sync= 'now wait_for xa_detach'; +set debug_sync= 'now signal close wait_for xa_detach'; xa commit 'x1'; set debug_sync= 'now signal go'; --connection default @@ -1832,11 +1832,11 @@ xa begin 'x2'; insert into t values (53); xa end 'x2'; xa prepare 'x2'; -set debug_sync= 'THD_cleanup_after_trans_cleanup signal xa_detach'; +set debug_sync= 'thread_end signal xa_detach wait_for close'; --disconnect con1 --connection con2 -set debug_sync= 'now wait_for xa_detach'; +set debug_sync= 'now signal close wait_for xa_detach'; xa rollback 'x2'; set debug_sync= 'now signal go'; --connection default @@ -1858,13 +1858,13 @@ insert into t values (3); xa end 'xuncommitted'; xa prepare 'xuncommitted'; set debug_sync= 'now signal go'; -set debug_sync= 'THD_cleanup_after_trans_cleanup signal xa_detach'; +set debug_sync= 'thread_end signal xa_detach wait_for close'; --disconnect con1 --connection default --error ER_LOCK_WAIT_TIMEOUT --reap # alter table -set debug_sync= 'now wait_for xa_detach'; +set debug_sync= 'now signal close wait_for xa_detach'; xa rollback 'xuncommitted'; select * from t; @@ -1882,13 +1882,13 @@ insert into t values (3); xa end 'committed_later'; xa prepare 'committed_later'; set debug_sync= 'now signal go'; -set debug_sync= 'THD_cleanup_after_trans_cleanup signal xa_detach'; +set debug_sync= 'thread_end signal xa_detach wait_for close'; --disconnect con1 --connection default --error ER_LOCK_WAIT_TIMEOUT --reap # alter table -set debug_sync= 'now wait_for xa_detach'; +set debug_sync= 'now signal close wait_for xa_detach'; xa commit 'committed_later'; @@ -1906,11 +1906,11 @@ insert into t values (4), (3); insert into t values (5); xa end 'x1'; xa prepare 'x1'; -set debug_sync= 'THD_cleanup_after_trans_cleanup signal xa_detach'; +set debug_sync= 'thread_end signal xa_detach wait_for close'; --disconnect con1 --connection con2 -set debug_sync= 'now wait_for xa_detach'; +set debug_sync= 'now signal close wait_for xa_detach'; xa commit 'x1'; set debug_sync= 'now signal go'; --connection default