merged 5.0-bugteam -> 5.1-bugteam

1 files changed, 0 insertions, 51 deletions

diff --git a/mysql-test/t/innodb_mysql.test b/mysql-test/t/innodb_mysql.test
index 77140fd85d7..4a6249eeccd 100644
--- a/mysql-test/t/innodb_mysql.test
+++ b/mysql-test/t/innodb_mysql.test
@@ -55,57 +55,6 @@ SELECT * FROM t1 WHERE a = 'abcde';
 DROP TABLE t1;
 
 #
-# Bug #42419: Server crash with "Pure virtual method called" on two
-# concurrent connections
-#
-
-connect (c1, localhost, root,,);
-connect (c2, localhost, root,,);
-
-CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT PRIMARY KEY, b INT)
- ENGINE=InnoDB;
-
-INSERT INTO t1 VALUES (1,1),(2,2),(3,3);
-
-connection c1;
-
-SET AUTOCOMMIT = 0;
-
-CREATE TEMPORARY TABLE t1_tmp (b INT);
-
-INSERT INTO t1_tmp SELECT b FROM t1 WHERE a = 3;
-INSERT INTO t1_tmp SELECT b FROM t1 WHERE a = 2;
-
-connection c2;
-
-SET AUTOCOMMIT = 0;
-
-CREATE TEMPORARY TABLE t2_tmp ( a INT, new_a INT);
-INSERT INTO t2_tmp VALUES (1,51),(2,52),(3,53);
-
-UPDATE t1 SET a = (SELECT new_a FROM t2_tmp WHERE t2_tmp.a = t1.a) WHERE a = 1;
-
---send
-UPDATE t1 SET a = (SELECT new_a FROM t2_tmp WHERE t2_tmp.a = t1.a) WHERE a = 2;
-
---sleep 3
-
-connection c1;
-
---error ER_LOCK_DEADLOCK
-INSERT INTO t1_tmp SELECT b FROM t1 WHERE a = 1;
-
-connection c2;
-
---reap
-UPDATE t1 SET a = (SELECT new_a FROM t2_tmp WHERE t2_tmp.a = t1.a) WHERE a = 3;
-
-connection default;
-disconnect c1;
-disconnect c2;
-DROP TABLE t1;
-
-#
 # Bug #37742: HA_EXTRA_KEYREAD flag is set when key contains only prefix of
 # requested column
 #