diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-03-09 08:06:59 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-09 08:06:59 +0100 |
| commit | 4933d21e5d93840ddcf41bf25ed92fbe253ae92d (patch) | |
| tree | a4d892b86aa46927978f82976fff61f1e5193383 /mysql-test/t/xa.test | |
| parent | 97ee59d27d3daca806fdb3577df5a0e0a45a0a30 (diff) | |
| parent | 7009bf411a8cb9a6e035b761b5e6352b4f474303 (diff) | |
| download | mariadb-git-4933d21e5d93840ddcf41bf25ed92fbe253ae92d.tar.gz | |
merge with mysql-5.5.21
Diffstat (limited to 'mysql-test/t/xa.test')
| -rw-r--r-- | mysql-test/t/xa.test | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/mysql-test/t/xa.test b/mysql-test/t/xa.test index 78f41763e20..ab589ae6727 100644 --- a/mysql-test/t/xa.test +++ b/mysql-test/t/xa.test @@ -338,8 +338,8 @@ DROP TABLE t1; DROP TABLE IF EXISTS t1, t2; --enable_warnings -CREATE TABLE t1 (a INT) engine=innodb; -CREATE TABLE t2 (a INT) engine=innodb; +CREATE TABLE t1 (a INT) ENGINE=InnoDB; +CREATE TABLE t2 (a INT) ENGINE=InnoDB; START TRANSACTION; INSERT INTO t1 VALUES (1); @@ -360,7 +360,6 @@ let $wait_condition= --source include/wait_condition.inc --sleep 0.1 DELETE FROM t1; -COMMIT; --echo # Connection con2 --connection con2 @@ -369,6 +368,14 @@ COMMIT; --reap --error ER_XA_RBDEADLOCK XA COMMIT 'xid1'; + +--echo # Connection default +connection default; + +COMMIT; + +--echo # Connection con2 +connection con2; # This caused the assert to be triggered XA START 'xid1'; |