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

dc324e86 · Davi Arnaut · 188293f5 · e139d9c7 · dc324e86 · dc324e86
Commit dc324e86 authored Oct 21, 2008 by Davi Arnaut
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

mysql-test/r/xa.result mysql-test/r/xa.result +1 -0

mysql-test/t/xa.test mysql-test/t/xa.test +1 -0

No files found.
--- 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