summaryrefslogtreecommitdiff
path: root/mysql-test/t/xa.test
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@sun.com>2010-03-10 16:26:39 +0400
committerSergey Vojtovich <svoj@sun.com>2010-03-10 16:26:39 +0400
commit64c6882ea9a18820abc75b7a5993953e06bbbcdb (patch)
tree5f4671ae771c04d2e81f96f1379732be95dcb817 /mysql-test/t/xa.test
parentc8d90775051f60f97c4bbfa65777a38eb1e588a7 (diff)
parentf4fe07f21f4e8346e55010a604ff832a165268ee (diff)
downloadmariadb-git-64c6882ea9a18820abc75b7a5993953e06bbbcdb.tar.gz
Merge fix for BUG51342 to 5.1-bugteam.
Diffstat (limited to 'mysql-test/t/xa.test')
-rw-r--r--mysql-test/t/xa.test16
1 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/t/xa.test b/mysql-test/t/xa.test
index f84d822170f..9eeb3017881 100644
--- a/mysql-test/t/xa.test
+++ b/mysql-test/t/xa.test
@@ -122,6 +122,22 @@ xa start 'a','c';
--connection default
drop table t1;
+--echo #
+--echo # BUG#51342 - more xid crashing
+--echo #
+CREATE TABLE t1(a INT) ENGINE=InnoDB;
+XA START 'x';
+SET SESSION autocommit=0;
+INSERT INTO t1 VALUES(1);
+--error ER_XAER_RMFAIL
+SET SESSION autocommit=1;
+SELECT @@autocommit;
+INSERT INTO t1 VALUES(1);
+XA END 'x';
+XA COMMIT 'x' ONE PHASE;
+DROP TABLE t1;
+SET SESSION autocommit=DEFAULT;
+
--echo End of 5.0 tests
#