diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-22 18:13:47 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-22 18:13:47 +0300 |
commit | 18f35a8608199b528c4786edcf46d9b20c3fcfa0 (patch) | |
tree | 79916d1eebb2dab81a603dc9c7b895ebde6df9fd /mysql-test/main/flush_read_lock.test | |
parent | 8121d03fd48c5107a2ef04b3d9991e1441e92995 (diff) | |
parent | 21973d0d8ed18f62c6cc220a0ee8729e7d44d790 (diff) | |
download | mariadb-git-18f35a8608199b528c4786edcf46d9b20c3fcfa0.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/main/flush_read_lock.test')
-rw-r--r-- | mysql-test/main/flush_read_lock.test | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/mysql-test/main/flush_read_lock.test b/mysql-test/main/flush_read_lock.test index c92d583e3a9..f24f6e389f1 100644 --- a/mysql-test/main/flush_read_lock.test +++ b/mysql-test/main/flush_read_lock.test @@ -1703,25 +1703,34 @@ insert into t3_trans values (1); xa end 'test1'; xa prepare 'test1'; --echo # Disconnect temporary connection +set debug_sync='thread_end SIGNAL test1_prepare'; disconnect con_tmp; +connection $con_aux1; +set debug_sync='now WAIT_FOR test1_prepare'; + + --echo # Create temporary connection for XA transaction. -connect (con_tmp,localhost,root,,); +connect (con_tmp1,localhost,root,,); xa start 'test2'; insert into t3_trans values (2); xa end 'test2'; xa prepare 'test2'; --echo # Disconnect temporary connection -set debug_sync='thread_end SIGNAL detached'; -disconnect con_tmp; +set debug_sync='thread_end SIGNAL test2_prepare'; +disconnect con_tmp1; + + --echo # Switching to connection '$con_aux1'. connection $con_aux1; -set debug_sync='now WAIT_FOR detached'; +set debug_sync='now WAIT_FOR test2_prepare'; flush tables with read lock; + --echo # Switching to connection 'default'. connection default; --echo # Send XA ROLLBACK 'test1' --send xa rollback 'test1' --echo # Switching to connection '$con_aux1'. + connection $con_aux1; --echo # Wait until XA ROLLBACK is blocked. let $wait_condition= |