summaryrefslogtreecommitdiff
path: root/mysql-test/r/xa.result
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-04-10 08:28:13 +0200
committerSergei Golubchik <sergii@pisem.net>2012-04-10 08:28:13 +0200
commit16c5c53fc21b162844c38a87ac48205448ca1d2f (patch)
tree7a50437d5f9da772ec8aaacab322e5f6c13e7305 /mysql-test/r/xa.result
parentf860b2aad41cd1b5ed0438ea211dcd78eec82b94 (diff)
parented418461614d912fbb114053508b3fb09b1fc2f0 (diff)
downloadmariadb-git-16c5c53fc21b162844c38a87ac48205448ca1d2f.tar.gz
mysql 5.5.23 merge
Diffstat (limited to 'mysql-test/r/xa.result')
-rw-r--r--mysql-test/r/xa.result1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/r/xa.result b/mysql-test/r/xa.result
index 3799e9417af..6c242d950ab 100644
--- a/mysql-test/r/xa.result
+++ b/mysql-test/r/xa.result
@@ -174,7 +174,6 @@ CREATE TABLE t1 (a INT) engine=InnoDB;
XA START 'a';
INSERT INTO t1 VALUES (1);
SAVEPOINT savep;
-ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the ACTIVE state
XA END 'a';
SELECT * FROM t1;
ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the IDLE state