diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-13 08:11:54 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-13 08:11:54 +0200 |
| commit | 1c4b6afbaaf7dbcee4b035d1bf79156fa68a6475 (patch) | |
| tree | b8940871f176f8472fcdd06332f97d004717f4aa /mysql-test/t/xa.test | |
| parent | 036b9dc9a1fa8418e0de5c9f8cf4fa2e5ee4513e (diff) | |
| parent | 9d95b8665a3d87ab857e77e220effc64454eb881 (diff) | |
| download | mariadb-git-1c4b6afbaaf7dbcee4b035d1bf79156fa68a6475.tar.gz | |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'mysql-test/t/xa.test')
| -rw-r--r-- | mysql-test/t/xa.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/xa.test b/mysql-test/t/xa.test index 9a8aa8673ea..b5ef5a118b1 100644 --- a/mysql-test/t/xa.test +++ b/mysql-test/t/xa.test @@ -462,7 +462,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 |