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

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

Browse source
This commit is contained in:
Davi Arnaut 2008-10-21 19:07:31 -02:00
commit dc324e86b2
2 changed files with 2 additions and 0 deletions
mysql-test
r
xa.result
t
xa.test

1
mysql-test/r/xa.result
View file

@ -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

1
mysql-test/t/xa.test
View file

@ -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