mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 10.5 into 10.6

Browse source
This commit is contained in:
Marko Mäkelä 2021-04-22 18:13:47 +03:00
commit 18f35a8608
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mysql-test/main/flush_read_lock.result
View file

@ -1392,19 +1392,22 @@ insert into t3_trans values (1);
xa end 'test1'; xa end 'test1';
xa prepare 'test1'; xa prepare 'test1';
# Disconnect temporary connection # Disconnect temporary connection
set debug_sync='thread_end SIGNAL test1_prepare';
disconnect con_tmp; disconnect con_tmp;
connection con1;
set debug_sync='now WAIT_FOR test1_prepare';
# Create temporary connection for XA transaction. # Create temporary connection for XA transaction.
connect con_tmp,localhost,root,,; connect con_tmp1,localhost,root,,;
xa start 'test2'; xa start 'test2';
insert into t3_trans values (2); insert into t3_trans values (2);
xa end 'test2'; xa end 'test2';
xa prepare 'test2'; xa prepare 'test2';
# Disconnect temporary connection # Disconnect temporary connection
set debug_sync='thread_end SIGNAL detached'; set debug_sync='thread_end SIGNAL test2_prepare';
disconnect con_tmp; disconnect con_tmp1;
# Switching to connection 'con1'. # Switching to connection 'con1'.
connection con1; connection con1;
set debug_sync='now WAIT_FOR detached'; set debug_sync='now WAIT_FOR test2_prepare';
flush tables with read lock; flush tables with read lock;
# Switching to connection 'default'. # Switching to connection 'default'.
connection default; connection default;

17
mysql-test/main/flush_read_lock.test
View file

@ -1703,25 +1703,34 @@ insert into t3_trans values (1);
xa end 'test1'; xa end 'test1';
xa prepare 'test1'; xa prepare 'test1';
--echo # Disconnect temporary connection --echo # Disconnect temporary connection
set debug_sync='thread_end SIGNAL test1_prepare';
disconnect con_tmp; disconnect con_tmp;
connection $con_aux1;
set debug_sync='now WAIT_FOR test1_prepare';
--echo # Create temporary connection for XA transaction. --echo # Create temporary connection for XA transaction.
connect (con_tmp,localhost,root,,); connect (con_tmp1,localhost,root,,);
xa start 'test2'; xa start 'test2';
insert into t3_trans values (2); insert into t3_trans values (2);
xa end 'test2'; xa end 'test2';
xa prepare 'test2'; xa prepare 'test2';
--echo # Disconnect temporary connection --echo # Disconnect temporary connection
set debug_sync='thread_end SIGNAL detached'; set debug_sync='thread_end SIGNAL test2_prepare';
disconnect con_tmp; disconnect con_tmp1;
--echo # Switching to connection '$con_aux1'. --echo # Switching to connection '$con_aux1'.
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; flush tables with read lock;
--echo # Switching to connection 'default'. --echo # Switching to connection 'default'.
connection default; connection default;
--echo # Send XA ROLLBACK 'test1' --echo # Send XA ROLLBACK 'test1'
--send xa rollback 'test1' --send xa rollback 'test1'
--echo # Switching to connection '$con_aux1'. --echo # Switching to connection '$con_aux1'.
connection $con_aux1; connection $con_aux1;
--echo # Wait until XA ROLLBACK is blocked. --echo # Wait until XA ROLLBACK is blocked.
let $wait_condition= let $wait_condition=