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/r/xa.result | |
| 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/r/xa.result')
| -rw-r--r-- | mysql-test/r/xa.result | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/r/xa.result b/mysql-test/r/xa.result index 646f2822239..46bfa6e962a 100644 --- a/mysql-test/r/xa.result +++ b/mysql-test/r/xa.result @@ -335,7 +335,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); |