diff options
| author | Sergey Petrunia <sergefp@mysql.com> | 2008-10-24 06:37:29 +0400 |
|---|---|---|
| committer | Sergey Petrunia <sergefp@mysql.com> | 2008-10-24 06:37:29 +0400 |
| commit | d5202ddd314385374a0afcf61343b7de7f53b192 (patch) | |
| tree | 7244ae78845c49822299b26c157128d1ec69ee54 /mysql-test | |
| parent | 844797c492312a5b0851a6cce3a84994aa4250a0 (diff) | |
| parent | 5bc2ad279d7f35100b4f580045f2c646e9a8b90b (diff) | |
| download | mariadb-git-d5202ddd314385374a0afcf61343b7de7f53b192.tar.gz | |
Merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/xa.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/xa.test | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/xa.result b/mysql-test/r/xa.result index 25d09f59247..592cf07522b 100644 --- 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 diff --git a/mysql-test/t/xa.test b/mysql-test/t/xa.test index 8f408fb1eda..591d7ac2c4d 100644 --- 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 |