diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2018-03-12 23:43:42 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2018-03-12 23:43:42 +0400 |
| commit | 9d95b8665a3d87ab857e77e220effc64454eb881 (patch) | |
| tree | 82da0927d27fb53033ad7a4413b9484a929bc184 | |
| parent | 68482a22155f1b741d0c19cff87292688ce17fc4 (diff) | |
| download | mariadb-git-9d95b8665a3d87ab857e77e220effc64454eb881.tar.gz | |
MDEV-15217 Assertion `thd->transaction.xid_state.xid.is_null()' failed
in trans_xa_start.
test fixed.
| -rw-r--r-- | mysql-test/r/xa.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/xa.test | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/r/xa.result b/mysql-test/r/xa.result index 782be3834d1..6ae4a06399c 100644 --- a/mysql-test/r/xa.result +++ b/mysql-test/r/xa.result @@ -282,7 +282,6 @@ INSERT INTO t1 SELECT * FROM t2; connection default; REPLACE INTO t2 SELECT * FROM t2; connection con1; -ERROR 40001: Deadlock found when trying to get lock; try restarting transaction disconnect con1; connect con2,localhost,root,,test; INSERT INTO t3 VALUES (1); diff --git a/mysql-test/t/xa.test b/mysql-test/t/xa.test index 85a792822dd..58ad1caaeef 100644 --- a/mysql-test/t/xa.test +++ b/mysql-test/t/xa.test @@ -414,7 +414,7 @@ INSERT INTO t1 SELECT * FROM t2; REPLACE INTO t2 SELECT * FROM t2; --connection con1 ---error ER_LOCK_DEADLOCK +--error 0, ER_LOCK_DEADLOCK, ER_LOCK_WAIT_TIMEOUT --reap --disconnect con1 |