summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb/r/innodb-lock.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@oracle.com>2011-11-10 16:45:47 +0200
committerMarko Mäkelä <marko.makela@oracle.com>2011-11-10 16:45:47 +0200
commit8c886b3bc0002ce5c14f9ffc9c0df4d2664b032d (patch)
tree01ac6e0aa3aef1158dc24ded592054dc434c9204 /mysql-test/suite/innodb/r/innodb-lock.result
parenta0a51251e49365cc0f256a2ebc90994dbe0d9a95 (diff)
downloadmariadb-git-8c886b3bc0002ce5c14f9ffc9c0df4d2664b032d.tar.gz
Bug #12842206 INNODB LOCKING REGRESSION FOR INSERT IGNORE: Add a test case.
The bug was accidentally fixed by fixing Bug#11759688 52020: InnoDB can still deadlock on just INSERT...ON DUPLICATE KEY a.k.a. the reintroduction of Bug#7975 deadlock without any locking, simple select and update
Diffstat (limited to 'mysql-test/suite/innodb/r/innodb-lock.result')
-rw-r--r--mysql-test/suite/innodb/r/innodb-lock.result17
1 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/r/innodb-lock.result b/mysql-test/suite/innodb/r/innodb-lock.result
index 4ace4065c34..5881d4c80b3 100644
--- a/mysql-test/suite/innodb/r/innodb-lock.result
+++ b/mysql-test/suite/innodb/r/innodb-lock.result
@@ -55,3 +55,20 @@ id x
1 1
2 10
drop table t1;
+#
+#Bug#12842206 INNODB LOCKING REGRESSION FOR INSERT IGNORE
+#fixed by re-fixing Bug#7975
+#aka Bug#11759688 52020: InnoDB can still deadlock on just INSERT...
+#
+CREATE TABLE t1 (a INT PRIMARY KEY, b INT NOT NULL) ENGINE=InnoDB;
+INSERT INTO t1 VALUES(3,1);
+BEGIN;
+INSERT IGNORE INTO t1 VALUES(3,14);
+BEGIN;
+INSERT IGNORE INTO t1 VALUES(3,23);
+SELECT * FROM t1 FOR UPDATE;
+COMMIT;
+a b
+3 1
+COMMIT;
+DROP TABLE t1;