Merge post-merge fix from mysql-5.0-bugteam.
This commit is contained in:
commit
dc324e86b2
@ -73,4 +73,5 @@ xa end 'a','c';
|
|||||||
ERROR XA102: XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected
|
ERROR XA102: XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected
|
||||||
xa rollback 'a','c';
|
xa rollback 'a','c';
|
||||||
xa start 'a','c';
|
xa start 'a','c';
|
||||||
|
drop table t1;
|
||||||
End of 5.0 tests
|
End of 5.0 tests
|
||||||
|
@ -116,5 +116,6 @@ xa start 'a','c';
|
|||||||
--disconnect con1
|
--disconnect con1
|
||||||
--disconnect con3
|
--disconnect con3
|
||||||
--connection default
|
--connection default
|
||||||
|
drop table t1;
|
||||||
|
|
||||||
--echo End of 5.0 tests
|
--echo End of 5.0 tests
|
||||||
|
Loading…
x
Reference in New Issue
Block a user