1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug #19815702 TIS620: CRASH WITH MULTI TABLE DELETE

Browse Source 
Description:
  Using correct length when moving to next field in cmp_ref. The store
length already includes the length bytes of blobs, which is already considered
earlier for blob types.
	Approved by Mattias, Jimmy [rb-7088]
This commit is contained in:
Thirunarayanan B 2014-11-04 17:40:29 +05:30
parent 56378ab9ce
commit 821dfcd8d2
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/suite/innodb/r/multi_delete.result Normal file
View File

@ -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;

8
mysql-test/suite/innodb/t/multi_delete.test Normal file
View File

@ -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;

6
storage/innobase/handler/ha_innodb.cc
View File

@ -10405,10 +10405,8 @@ ha_innobase::cmp_ref(
len1 = innobase_read_from_2_little_endian(ref1);
len2 = innobase_read_from_2_little_endian(ref2);
ref1 += 2;
ref2 += 2;
result = ((Field_blob*)field)->cmp( ref1, len1,
ref2, len2);
result = ((Field_blob*)field)->cmp(ref1 + 2, len1,
ref2 + 2, len2);
} else {
result = field->key_cmp(ref1, ref2);
}