Revert "Bug #19815702 TIS620: CRASH WITH MULTI TABLE DELETE"

This reverts commit e7391e4.
percona · Feb 27, 2015 · 7976aaf · 7976aaf
1 parent 04922b0
commit 7976aaf
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/mysql-test/suite/innodb/r/multi_delete.result b/mysql-test/suite/innodb/r/multi_delete.result
@@ -0,0 +1,14 @@
+create table t1 (a int,b varchar(100) ,d blob,primary key (a,d(10), b(10))) engine=innodb;
+insert into t1 values (1,'e','a'),(5,'f','5'), (3,'a','b');
+create table t2 (a int) engine=innodb;
+insert into t2() values(4),(5);
+delete t1 from t1, t2 where t1.a;
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) NOT NULL DEFAULT '0',
+  `b` varchar(100) NOT NULL DEFAULT '',
+  `d` blob NOT NULL,
+  PRIMARY KEY (`a`,`d`(10),`b`(10))
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+drop table t1, t2;
diff --git a/mysql-test/suite/innodb/t/multi_delete.test b/mysql-test/suite/innodb/t/multi_delete.test
@@ -0,0 +1,8 @@
+--source include/have_innodb.inc
+create table t1 (a int,b varchar(100) ,d blob,primary key (a,d(10), b(10))) engine=innodb;
+insert into t1 values (1,'e','a'),(5,'f','5'), (3,'a','b');
+create table t2 (a int) engine=innodb;
+insert into t2() values(4),(5);
+delete t1 from t1, t2 where t1.a;
+show create table t1;
+drop table t1, t2;