Skip to content

Commit 8e5ae4e

Browse files
committed
Test case fix: sort XA RECOVER result
Part of MDEV-742 - XA PREPAREd transaction survive disconnect/server restart
1 parent c8ae357 commit 8e5ae4e

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

mysql-test/suite/rpl/r/rpl_xa.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ connection slave;
3434
include/sync_with_master_gtid.inc
3535
xa recover;
3636
formatID gtrid_length bqual_length data
37-
1 1 0 t
3837
1 1 0 s
38+
1 1 0 t
3939
connection master;
4040
xa commit 't';
4141
xa commit 's';
@@ -87,8 +87,8 @@ disconnect master_ro_1;
8787
connection master;
8888
xa recover;
8989
formatID gtrid_length bqual_length data
90-
1 4 0 ro_2
9190
1 4 0 ro_1
91+
1 4 0 ro_2
9292
*** Zero prepared xa:s must be in the list:
9393
xa recover;
9494
formatID gtrid_length bqual_length data

mysql-test/suite/rpl/r/rpl_xa_gtid_pos_auto_engine.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ SELECT @@global.gtid_slave_pos = CONCAT(domain_id,"-",server_id,"-",seq_no) FROM
4343
1
4444
xa recover;
4545
formatID gtrid_length bqual_length data
46-
1 1 0 t
4746
1 1 0 s
47+
1 1 0 t
4848
connection master;
4949
xa commit 't';
5050
xa commit 's';
@@ -96,8 +96,8 @@ disconnect master_ro_1;
9696
connection master;
9797
xa recover;
9898
formatID gtrid_length bqual_length data
99-
1 4 0 ro_2
10099
1 4 0 ro_1
100+
1 4 0 ro_2
101101
*** Zero prepared xa:s must be in the list:
102102
xa recover;
103103
formatID gtrid_length bqual_length data

mysql-test/suite/rpl/t/rpl_xa.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ if ($rpl_xa_check)
5555
--eval SELECT $rpl_xa_check_rhs
5656
}
5757
}
58+
sorted_result;
5859
xa recover;
5960

6061
connection master;
@@ -126,6 +127,7 @@ while ($p_trx)
126127

127128
--echo *** $ro_cases prepared xa:s must be in the list:
128129
--connection master
130+
sorted_result;
129131
xa recover;
130132

131133
--let $p_trx=$ro_cases

0 commit comments

Comments
 (0)