Skip to content

M
MariaDB
Commit e6acddf1 authored by Nikita Malyavin's avatar Nikita Malyavin
Browse files
Options

main.alter_table_online_debug: fix race in XA tests

parent d59d8836
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
mysql-test/main/alter_table_online_debug.result
View file @ e6acddf1
...@@ -1577,10 +1577,10 @@ xa begin 'x1'; ...@@ -1577,10 +1577,10 @@ xa begin 'x1';
update t set a = 2 where a = 1; update t set a = 2 where a = 1;
xa end 'x1'; xa end 'x1';
xa prepare '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; disconnect con1;
connection con2; connection con2;
set debug_sync= 'now wait_for xa_detach'; set debug_sync= 'now signal close wait_for xa_detach';
xa commit 'x1'; xa commit 'x1';
set debug_sync= 'now signal go'; set debug_sync= 'now signal go';
connection default; connection default;
...@@ -1596,10 +1596,10 @@ xa begin 'x2'; ...@@ -1596,10 +1596,10 @@ xa begin 'x2';
insert into t values (53); insert into t values (53);
xa end 'x2'; xa end 'x2';
xa prepare '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; disconnect con1;
connection con2; connection con2;
set debug_sync= 'now wait_for xa_detach'; set debug_sync= 'now signal close wait_for xa_detach';
xa rollback 'x2'; xa rollback 'x2';
set debug_sync= 'now signal go'; set debug_sync= 'now signal go';
connection default; connection default;
...@@ -1618,11 +1618,11 @@ insert into t values (3); ...@@ -1618,11 +1618,11 @@ insert into t values (3);
xa end 'xuncommitted'; xa end 'xuncommitted';
xa prepare 'xuncommitted'; xa prepare 'xuncommitted';
set debug_sync= 'now signal go'; 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; disconnect con1;
connection default; connection default;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction 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'; xa rollback 'xuncommitted';
select * from t; select * from t;
a a
...@@ -1638,11 +1638,11 @@ insert into t values (3); ...@@ -1638,11 +1638,11 @@ insert into t values (3);
xa end 'committed_later'; xa end 'committed_later';
xa prepare 'committed_later'; xa prepare 'committed_later';
set debug_sync= 'now signal go'; 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; disconnect con1;
connection default; connection default;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction 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'; xa commit 'committed_later';
select * from t; select * from t;
a a
...@@ -1659,10 +1659,10 @@ ERROR 23000: Duplicate entry '3' for key 'PRIMARY' ...@@ -1659,10 +1659,10 @@ ERROR 23000: Duplicate entry '3' for key 'PRIMARY'
insert into t values (5); insert into t values (5);
xa end 'x1'; xa end 'x1';
xa prepare '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; disconnect con1;
connection con2; connection con2;
set debug_sync= 'now wait_for xa_detach'; set debug_sync= 'now signal close wait_for xa_detach';
xa commit 'x1'; xa commit 'x1';
set debug_sync= 'now signal go'; set debug_sync= 'now signal go';
connection default; connection default;
......
mysql-test/main/alter_table_online_debug.test
View file @ e6acddf1
...@@ -1810,11 +1810,11 @@ xa begin 'x1'; ...@@ -1810,11 +1810,11 @@ xa begin 'x1';
update t set a = 2 where a = 1; update t set a = 2 where a = 1;
xa end 'x1'; xa end 'x1';
xa prepare '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 --disconnect con1
--connection con2 --connection con2
set debug_sync= 'now wait_for xa_detach'; set debug_sync= 'now signal close wait_for xa_detach';
xa commit 'x1'; xa commit 'x1';
set debug_sync= 'now signal go'; set debug_sync= 'now signal go';
--connection default --connection default
...@@ -1832,11 +1832,11 @@ xa begin 'x2'; ...@@ -1832,11 +1832,11 @@ xa begin 'x2';
insert into t values (53); insert into t values (53);
xa end 'x2'; xa end 'x2';
xa prepare '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 --disconnect con1
--connection con2 --connection con2
set debug_sync= 'now wait_for xa_detach'; set debug_sync= 'now signal close wait_for xa_detach';
xa rollback 'x2'; xa rollback 'x2';
set debug_sync= 'now signal go'; set debug_sync= 'now signal go';
--connection default --connection default
...@@ -1858,13 +1858,13 @@ insert into t values (3); ...@@ -1858,13 +1858,13 @@ insert into t values (3);
xa end 'xuncommitted'; xa end 'xuncommitted';
xa prepare 'xuncommitted'; xa prepare 'xuncommitted';
set debug_sync= 'now signal go'; 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 --disconnect con1
--connection default --connection default
--error ER_LOCK_WAIT_TIMEOUT --error ER_LOCK_WAIT_TIMEOUT
--reap # alter table --reap # alter table
set debug_sync= 'now wait_for xa_detach'; set debug_sync= 'now signal close wait_for xa_detach';
xa rollback 'xuncommitted'; xa rollback 'xuncommitted';
select * from t; select * from t;
...@@ -1882,13 +1882,13 @@ insert into t values (3); ...@@ -1882,13 +1882,13 @@ insert into t values (3);
xa end 'committed_later'; xa end 'committed_later';
xa prepare 'committed_later'; xa prepare 'committed_later';
set debug_sync= 'now signal go'; 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 --disconnect con1
--connection default --connection default
--error ER_LOCK_WAIT_TIMEOUT --error ER_LOCK_WAIT_TIMEOUT
--reap # alter table --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'; xa commit 'committed_later';
...@@ -1906,11 +1906,11 @@ insert into t values (4), (3); ...@@ -1906,11 +1906,11 @@ insert into t values (4), (3);
insert into t values (5); insert into t values (5);
xa end 'x1'; xa end 'x1';
xa prepare '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 --disconnect con1
--connection con2 --connection con2
set debug_sync= 'now wait_for xa_detach'; set debug_sync= 'now signal close wait_for xa_detach';
xa commit 'x1'; xa commit 'x1';
set debug_sync= 'now signal go'; set debug_sync= 'now signal go';
--connection default --connection default
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7