Commit 8c34ae26 authored by igor@olga.mysql.com's avatar igor@olga.mysql.com
Browse files

Fixed bug #28337: wrong results for grouping queries with correlated 

subqueries in WHERE conditions.
This bug was introduced by the patch for bug 27321.
parent 364014e4

mysql-test/r/subselect.result

+30 −0
Original line number Diff line number Diff line
@@ -4041,4 +4041,34 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	PRIMARY	t1	ref	a	a	5	const	1	Using where; Using index

2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort

DROP TABLE t1;

CREATE TABLE t1 (id int NOT NULL, st CHAR(2), INDEX idx(id));

INSERT INTO t1 VALUES

(3,'FL'), (2,'GA'), (4,'FL'), (1,'GA'), (5,'NY'), (7,'FL'), (6,'NY');

CREATE TABLE t2 (id int NOT NULL, INDEX idx(id));

INSERT INTO t2 VALUES (7), (5), (1), (3);

SELECT id, st FROM t1 

WHERE st IN ('GA','FL') AND EXISTS(SELECT 1 FROM t2 WHERE t2.id=t1.id);

id	st

3	FL

1	GA

7	FL

SELECT id, st FROM t1 

WHERE st IN ('GA','FL') AND EXISTS(SELECT 1 FROM t2 WHERE t2.id=t1.id)

GROUP BY id;

id	st

1	GA

3	FL

7	FL

SELECT id, st FROM t1 

WHERE st IN ('GA','FL') AND NOT EXISTS(SELECT 1 FROM t2 WHERE t2.id=t1.id);

id	st

2	GA

4	FL

SELECT id, st FROM t1 

WHERE st IN ('GA','FL') AND NOT EXISTS(SELECT 1 FROM t2 WHERE t2.id=t1.id)

GROUP BY id;

id	st

2	GA

4	FL

DROP TABLE t1,t2;

End of 5.0 tests.

mysql-test/t/subselect.test

+24 −0
Original line number Diff line number Diff line
@@ -2882,4 +2882,28 @@ INSERT INTO t1 VALUES (1,1),(2,1); 
EXPLAIN SELECT 1 FROM t1 WHERE a = (SELECT COUNT(*) FROM t1 GROUP BY b);

DROP TABLE t1;



#

# Bug #28377: grouping query with a correlated subquery in WHERE condition

#  



CREATE TABLE t1 (id int NOT NULL, st CHAR(2), INDEX idx(id));

INSERT INTO t1 VALUES

  (3,'FL'), (2,'GA'), (4,'FL'), (1,'GA'), (5,'NY'), (7,'FL'), (6,'NY');

CREATE TABLE t2 (id int NOT NULL, INDEX idx(id));

INSERT INTO t2 VALUES (7), (5), (1), (3);



SELECT id, st FROM t1 

  WHERE st IN ('GA','FL') AND EXISTS(SELECT 1 FROM t2 WHERE t2.id=t1.id);

SELECT id, st FROM t1 

  WHERE st IN ('GA','FL') AND EXISTS(SELECT 1 FROM t2 WHERE t2.id=t1.id)

    GROUP BY id;



SELECT id, st FROM t1 

  WHERE st IN ('GA','FL') AND NOT EXISTS(SELECT 1 FROM t2 WHERE t2.id=t1.id);

SELECT id, st FROM t1 

  WHERE st IN ('GA','FL') AND NOT EXISTS(SELECT 1 FROM t2 WHERE t2.id=t1.id)

    GROUP BY id;



DROP TABLE t1,t2;



--echo End of 5.0 tests.

sql/item.cc

+2 −1
Original line number Diff line number Diff line
@@ -3503,7 +3503,8 @@ Item_field::fix_outer_field(THD *thd, Field **from_field, Item **reference) 
          prev_subselect_item->const_item_cache= 0;

          set_field(*from_field);

          if (!last_checked_context->select_lex->having_fix_field &&

              select->group_list.elements)

              select->group_list.elements &&

              (place == SELECT_LIST || place == IN_HAVING))

          {

            Item_outer_ref *rf;

            /*