Commit 5082c41b authored by unknown's avatar unknown
Browse files

Manual merge

parents c78623fa 4161d7cb

mysql-test/r/subselect.result

+17 −0
Original line number Diff line number Diff line
@@ -2829,6 +2829,23 @@ SELECT * FROM t1 WHERE (a,b) IN (('aaa','aaa'), ('aaa','bbb')); 
a	b

aaa	aaa

DROP TABLE t1;

CREATE TABLE t1 (a int);

CREATE TABLE t2 (a int, b int);

CREATE TABLE t3 (b int NOT NULL);

INSERT INTO t1 VALUES (1), (2), (3), (4);

INSERT INTO t2 VALUES (1,10), (3,30);

SELECT * FROM t2 LEFT JOIN t3 ON t2.b=t3.b

WHERE t3.b IS NOT NULL OR t2.a > 10;

a	b	b

SELECT * FROM t1

WHERE t1.a NOT IN (SELECT a FROM t2 LEFT JOIN t3 ON t2.b=t3.b

WHERE t3.b IS NOT NULL OR t2.a > 10);

a

1

2

3

4

DROP TABLE t1,t2,t3;

create table t1 (df decimal(5,1));

insert into t1 values(1.1);

insert into t1 values(2.2);

mysql-test/t/subselect.test

+18 −0
Original line number Diff line number Diff line
@@ -1801,6 +1801,24 @@ SELECT * FROM t1 WHERE (a,b) IN (('aaa','aaa'), ('aaa','bbb')); 


DROP TABLE t1;



#

# Bug #11479: subquery over left join with an empty inner table 

#



CREATE TABLE t1 (a int);

CREATE TABLE t2 (a int, b int);

CREATE TABLE t3 (b int NOT NULL);

INSERT INTO t1 VALUES (1), (2), (3), (4);

INSERT INTO t2 VALUES (1,10), (3,30);



SELECT * FROM t2 LEFT JOIN t3 ON t2.b=t3.b

  WHERE t3.b IS NOT NULL OR t2.a > 10;

SELECT * FROM t1

  WHERE t1.a NOT IN (SELECT a FROM t2 LEFT JOIN t3 ON t2.b=t3.b

                       WHERE t3.b IS NOT NULL OR t2.a > 10);



DROP TABLE t1,t2,t3;



# End of 4.1 tests



#