Skip to content

M
mariadb
Commit dc324e86 authored by Davi Arnaut's avatar Davi Arnaut
Browse files
Options

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

parents 188293f5 e139d9c7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
mysql-test/r/xa.result
View file @ dc324e86
...@@ -73,4 +73,5 @@ xa end 'a','c'; ...@@ -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
mysql-test/t/xa.test
View file @ dc324e86
...@@ -116,5 +116,6 @@ xa start 'a','c'; ...@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7