summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb/r/deadlock_detect.result
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2018-01-08 12:25:31 +0200
committerJan Lindström <jan.lindstrom@mariadb.com>2018-01-08 12:25:31 +0200
commitae7e1b9b13ddc23167bd058ff4718ac116d17126 (patch)
tree8b9539c487f5ce8598c673768167a7da8ce71171 /mysql-test/suite/innodb/r/deadlock_detect.result
parent9ede5692601e7f8b96e9300eb764047c0453f2f4 (diff)
downloadmariadb-git-ae7e1b9b13ddc23167bd058ff4718ac116d17126.tar.gz
MDEV-13262: innodb.deadlock_detect failed in buildbot
There is a race condition on a test. con1 is the older transaction as it query started wait first. Test continues so that con1 gets lock wait timeout first. There is possibility that default connection gets lock timeout also or as con1 is rolled back it gets the locks it waited and does the update. Fixed by removing query outputs as they could vary and accepting success from default connection query.
Diffstat (limited to 'mysql-test/suite/innodb/r/deadlock_detect.result')
-rw-r--r--mysql-test/suite/innodb/r/deadlock_detect.result6
1 files changed, 0 insertions, 6 deletions
diff --git a/mysql-test/suite/innodb/r/deadlock_detect.result b/mysql-test/suite/innodb/r/deadlock_detect.result
index c3e3794ed21..4e14eff34b2 100644
--- a/mysql-test/suite/innodb/r/deadlock_detect.result
+++ b/mysql-test/suite/innodb/r/deadlock_detect.result
@@ -8,21 +8,15 @@ PRIMARY KEY(id)
INSERT INTO t1 VALUES(1), (2), (3);
BEGIN;
SELECT * FROM t1 WHERE id = 1 FOR UPDATE;
-id
-1
connect con1,localhost,root,,;
BEGIN;
SELECT * FROM t1 WHERE id = 2 FOR UPDATE;
-id
-2
SELECT * FROM t1 WHERE id = 1 FOR UPDATE;
connection default;
SELECT * FROM t1 WHERE id = 2 FOR UPDATE;
connection con1;
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction
ROLLBACK;
connection default;
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction
ROLLBACK;
DROP TABLE t1;
disconnect con1;