Commit dc324e86 authored by Davi Arnaut's avatar Davi Arnaut
Browse files

Merge post-merge fix from mysql-5.0-bugteam.

parents 188293f5 e139d9c7

mysql-test/r/xa.result

+1 −0
Original line number Diff line number Diff line
@@ -73,4 +73,5 @@ xa end 'a','c'; 
ERROR XA102: XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected

xa rollback 'a','c';

xa start 'a','c';

drop table t1;

End of 5.0 tests

mysql-test/t/xa.test

+1 −0
Original line number Diff line number Diff line
@@ -116,5 +116,6 @@ xa start 'a','c'; 
--disconnect con1

--disconnect con3

--connection default

drop table t1;



--echo End of 5.0 tests