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

2008-10-21 19:07:31 -02:00 · 2008-10-21 19:07:31 -02:00 · dc324e86b2
commit dc324e86b2
parent 188293f5b3 e139d9c775
2 changed files with 2 additions and 0 deletions
--- a/mysql-test/r/xa.result
+++ b/mysql-test/r/xa.result
@ -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
--- a/mysql-test/t/xa.test
+++ b/mysql-test/t/xa.test
@ -116,5 +116,6 @@ xa start 'a','c';
 --disconnect con1
 --disconnect con3
 --connection default
+drop table t1;

 --echo End of 5.0 tests