diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2016-03-25 20:51:22 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2016-03-31 10:11:16 +0400 |
| commit | 282497dd6d1049b4fb963641504c2733752845a7 (patch) | |
| tree | 7288d17c29fbbe9ac47ec51f6988fb954f59a361 /mysql-test/t/xa.test | |
| parent | 5052e2479e873461bebfcedbc674bbaf57d3c968 (diff) | |
| download | mariadb-git-282497dd6d1049b4fb963641504c2733752845a7.tar.gz | |
MDEV-6720 - enable connection log in mysqltest by default
Diffstat (limited to 'mysql-test/t/xa.test')
| -rw-r--r-- | mysql-test/t/xa.test | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/mysql-test/t/xa.test b/mysql-test/t/xa.test index 1709886eb0c..f1576f021ec 100644 --- a/mysql-test/t/xa.test +++ b/mysql-test/t/xa.test @@ -258,19 +258,16 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1(a INT, b INT, PRIMARY KEY(a)) engine=InnoDB; INSERT INTO t1 VALUES (1, 1), (2, 2); ---echo # Connection con1 connect (con1, localhost, root); XA START 'a'; UPDATE t1 SET b= 3 WHERE a=1; ---echo # Connection default connection default; XA START 'b'; UPDATE t1 SET b=4 WHERE a=2; --echo # Sending: --send UPDATE t1 SET b=5 WHERE a=1 ---echo # Connection con1 connection con1; --sleep 1 --error ER_LOCK_DEADLOCK @@ -279,7 +276,6 @@ UPDATE t1 SET b=6 WHERE a=2; --error ER_XA_RBDEADLOCK XA COMMIT 'a'; ---echo # Connection default connection default; --echo # Reaping: UPDATE t1 SET b=5 WHERE a=1 --reap @@ -343,13 +339,11 @@ CREATE TABLE t2 (a INT) ENGINE=InnoDB; START TRANSACTION; INSERT INTO t1 VALUES (1); ---echo # Connection con2 --connect (con2,localhost,root) XA START 'xid1'; --echo # Sending: --send INSERT INTO t2 SELECT a FROM t1 ---echo # Connection default --connection default let $wait_condition= SELECT COUNT(*) = 1 FROM information_schema.processlist @@ -360,7 +354,6 @@ let $wait_condition= --sleep 0.1 DELETE FROM t1; ---echo # Connection con2 --connection con2 --echo # Reaping: INSERT INTO t2 SELECT a FROM t1 --error ER_LOCK_DEADLOCK @@ -368,12 +361,10 @@ DELETE FROM t1; --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'; @@ -382,7 +373,6 @@ XA END 'xid1'; XA PREPARE 'xid1'; XA ROLLBACK 'xid1'; ---echo # Connection default connection default; DROP TABLE t1, t2; disconnect con2; |