Commit 4ed157ee authored by unknown's avatar unknown
Browse files

BUG#21077: 4.1->5.0 merge

parents 2f5ae7c5 9907e970

mysql-test/r/innodb_mysql.result

+21 −0
Original line number Diff line number Diff line
@@ -83,6 +83,27 @@ b a 
3	3

3	3

DROP TABLE t1, t2, t3;

CREATE TABLE `t1` (`id1` INT) ;

INSERT INTO `t1` (`id1`) VALUES (1),(5),(2);

CREATE TABLE `t2` (

`id1` INT,

`id2` INT NOT NULL,

`id3` INT,

`id4` INT NOT NULL,

UNIQUE (`id2`,`id4`),

KEY (`id1`)

) ENGINE=InnoDB;

INSERT INTO `t2`(`id1`,`id2`,`id3`,`id4`) VALUES 

(1,1,1,0),

(1,1,2,1),

(5,1,2,2),

(6,1,2,3),

(1,2,2,2),

(1,2,1,1);

SELECT `id1` FROM `t1` WHERE `id1` NOT IN (SELECT `id1` FROM `t2` WHERE `id2` = 1 AND `id3` = 2);

id1

2

DROP TABLE t1, t2;

create table t1m (a int) engine=myisam;

create table t1i (a int) engine=innodb;

create table t2m (a int) engine=myisam;

mysql-test/t/innodb_mysql.test

+27 −0
Original line number Diff line number Diff line
@@ -90,6 +90,33 @@ SELECT STRAIGHT_JOIN SQL_NO_CACHE t1.b, t1.a FROM t1, t3, t2 WHERE 
  t3.a = t2.a AND t2.b = t1.a AND t3.b = 1 AND t3.c IN (1, 2) 

  ORDER BY t1.b LIMIT 5;

DROP TABLE t1, t2, t3;





# BUG#21077 (The testcase is not deterministic so correct execution doesn't

# prove anything) For proof one should track if sequence of ha_innodb::* func

# calls is correct.

CREATE TABLE `t1` (`id1` INT) ;

INSERT INTO `t1` (`id1`) VALUES (1),(5),(2);



CREATE TABLE `t2` (

  `id1` INT,

  `id2` INT NOT NULL,

  `id3` INT,

  `id4` INT NOT NULL,

  UNIQUE (`id2`,`id4`),

  KEY (`id1`)

) ENGINE=InnoDB;



INSERT INTO `t2`(`id1`,`id2`,`id3`,`id4`) VALUES 

(1,1,1,0),

(1,1,2,1),

(5,1,2,2),

(6,1,2,3),

(1,2,2,2),

(1,2,1,1);



SELECT `id1` FROM `t1` WHERE `id1` NOT IN (SELECT `id1` FROM `t2` WHERE `id2` = 1 AND `id3` = 2);

DROP TABLE t1, t2;

#

# Bug #12882  	min/max inconsistent on empty table

#