Adding upstream version 1:10.5.12.upstream/1%10.5.12upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 24 insertions, 0 deletions

diff --git a/mysql-test/suite/innodb/r/deadlock_detect.result b/mysql-test/suite/innodb/r/deadlock_detect.result
new file mode 100644
index 00000000..4e14eff3
--- /dev/null
+++ b/mysql-test/suite/innodb/r/deadlock_detect.result
@@ -0,0 +1,24 @@
+SET GLOBAL innodb_deadlock_detect=OFF;
+SET GLOBAL innodb_lock_wait_timeout=2;
+connection default;
+CREATE TABLE t1(
+id	INT,
+PRIMARY KEY(id)
+) ENGINE=InnoDB;
+INSERT INTO t1 VALUES(1), (2), (3);
+BEGIN;
+SELECT * FROM t1 WHERE id = 1 FOR UPDATE;
+connect  con1,localhost,root,,;
+BEGIN;
+SELECT * FROM t1 WHERE id = 2 FOR UPDATE;
+SELECT * FROM t1 WHERE id = 1 FOR UPDATE;
+connection default;
+SELECT * FROM t1 WHERE id = 2 FOR UPDATE;
+connection con1;
+ROLLBACK;
+connection default;
+ROLLBACK;
+DROP TABLE t1;
+disconnect con1;
+SET GLOBAL innodb_lock_wait_timeout=default;
+SET GLOBAL innodb_deadlock_detect=default;