Bug#12935 Local and XA transactions not mutually exclusive

1 files changed, 10 insertions, 2 deletions

diff --git a/mysql-test/r/xa.result b/mysql-test/r/xa.result
index ae5407ce409..5fb03d2378e 100644
--- a/mysql-test/r/xa.result
+++ b/mysql-test/r/xa.result
@@ -9,10 +9,10 @@ select * from t1;
 a
 xa start 'test2';
 xa start 'test-bad';
-ERROR XAE07: XAER_RMFAIL: The command cannot be executed in the ACTIVE state
+ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the  ACTIVE state
 insert t1 values (20);
 xa prepare 'test2';
-ERROR XAE07: XAER_RMFAIL: The command cannot be executed in the ACTIVE state
+ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the  ACTIVE state
 xa end 'test2';
 xa prepare 'test2';
 xa commit 'test2';
@@ -21,7 +21,13 @@ a
 20
 xa start 'testa','testb';
 insert t1 values (30);
+commit;
+ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the  ACTIVE state
 xa end 'testa','testb';
+begin;
+ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the  IDLE state
+create table t2 (a int);
+ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the  IDLE state
 xa start 'testa','testb';
 ERROR XAE08: XAER_DUPID: The XID already exists
 xa start 'testa','testb', 123;
@@ -30,6 +36,8 @@ xa start 0x7465737462, 0x2030405060, 0xb;
 insert t1 values (40);
 xa end 'testb',' 0@P`',11;
 xa prepare 'testb',0x2030405060,11;
+start transaction;
+ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the  PREPARED state
 xa recover;
 formatID	gtrid_length	bqual_length	data
 11	5	5	testb 0@P`