Commit 941f2fb9 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt 

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


mysql-test/r/subselect3.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/subselect.result:
  merging
mysql-test/t/subselect.test:
  merging
sql/sql_base.cc:
  mergin
sql/sql_class.h:
  merging
sql/sql_select.cc:
  merging
parents c2426620 b70693f5

mysql-test/r/subselect.result

+31 −6
Original line number Diff line number Diff line
@@ -3712,12 +3712,6 @@ bb 2 
cc	3

dd	1

DROP TABLE t1,t2,t3;

CREATE TABLE t1 (s1 char(1));

INSERT INTO t1 VALUES ('a');

SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);

s1

a

DROP TABLE t1;

CREATE TABLE t1(f1 int);

CREATE TABLE t2(f2 int, f21 int, f3 timestamp);

INSERT INTO t1 VALUES (1),(1),(2),(2);
@@ -3886,3 +3880,34 @@ this is a test. 3 
this is a test.	1

this is a test.	2

DROP table t1;

CREATE TABLE t1 (a int, b int);

CREATE TABLE t2 (m int, n int);

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

INSERT INTO t2 VALUES (1,11), (2,22), (3,32), (4,44), (4,44);

SELECT COUNT(*), a,

(SELECT m FROM t2 WHERE m = count(*) LIMIT 1)

FROM t1 GROUP BY a;

COUNT(*)	a	(SELECT m FROM t2 WHERE m = count(*) LIMIT 1)

2	2	2

3	3	3

1	4	1

SELECT COUNT(*), a,

(SELECT MIN(m) FROM t2 WHERE m = count(*))

FROM t1 GROUP BY a;

COUNT(*)	a	(SELECT MIN(m) FROM t2 WHERE m = count(*))

2	2	2

3	3	3

1	4	1

SELECT COUNT(*), a       

FROM t1 GROUP BY a

HAVING (SELECT MIN(m) FROM t2 WHERE m = count(*)) > 1;

COUNT(*)	a

2	2

3	3

DROP TABLE t1,t2;

CREATE TABLE t1 (s1 char(1));

INSERT INTO t1 VALUES ('a');

SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);

s1

a

DROP TABLE t1;

mysql-test/r/subselect3.result

+53 −0
Original line number Diff line number Diff line
@@ -645,3 +645,56 @@ a b Z 
2	2	0

3	3	1

drop table t1,t2;

CREATE TABLE t1 (a int, b INT, c CHAR(10) NOT NULL, PRIMARY KEY (a, b));

INSERT INTO t1 VALUES (1,1,'a'), (1,2,'b'), (1,3,'c'), (1,4,'d'), (1,5,'e'),

(2,1,'f'), (2,2,'g'), (2,3,'h'), (3,4,'i'),(3,3,'j'), (3,2,'k'), (3,1,'l'),

(1,9,'m');

CREATE TABLE t2 (a int, b INT, c CHAR(10) NOT NULL, PRIMARY KEY (a, b));

INSERT INTO t2 SELECT * FROM t1;

SELECT a, MAX(b), (SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b))

as test FROM t1 GROUP BY a;

a	MAX(b)	test

1	9	m

2	3	h

3	4	i

SELECT * FROM t1 GROUP by t1.a

HAVING (MAX(t1.b) > (SELECT MAX(t2.b) FROM t2 WHERE t2.c < t1.c

HAVING MAX(t2.b+t1.a) < 10));

a	b	c

SELECT a, AVG(b), (SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=AVG(t1.b))

AS test FROM t1 GROUP BY a;

a	AVG(b)	test

1	4.0000	NULL

2	2.0000	k

3	2.5000	NULL

SELECT a,b,c FROM t1 WHERE b in (9,3,4) ORDER BY b,c;

a	b	c

1	3	c

2	3	h

3	3	j

1	4	d

3	4	i

1	9	m

SELECT a, MAX(b),

(SELECT COUNT(DISTINCT t.c) FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b) 

LIMIT 1) 

as cnt, 

(SELECT t.b FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b) LIMIT 1) 

as t_b,

(SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b) LIMIT 1) 

as t_b,

(SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b) ORDER BY t.c LIMIT 1)

as t_b

FROM t1 GROUP BY a;

a	MAX(b)	cnt	t_b	t_b	t_b

1	9	1	9	m	m

2	3	1	3	h	h

3	4	1	4	i	i

SELECT a, MAX(b),

(SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b) LIMIT 1) as test 

FROM t1 GROUP BY a;

a	MAX(b)	test

1	9	m

2	3	h

3	4	i

DROP TABLE t1, t2;

mysql-test/r/union.result

+8 −0
Original line number Diff line number Diff line
@@ -1437,4 +1437,12 @@ a 
SELECT a FROM (SELECT a FROM t1 UNION SELECT a FROM t1 ORDER BY c) AS test;

ERROR 42S22: Unknown column 'c' in 'order clause'

DROP TABLE t1;

(select 1 into @var) union (select 1);

ERROR HY000: Incorrect usage of UNION and INTO

(select 1) union (select 1 into @var);

select @var;

@var

1

(select 2) union (select 1 into @var);

ERROR 42000: Result consisted of more than one row

End of 5.0 tests

mysql-test/t/subselect.test

+30 −7
Original line number Diff line number Diff line
@@ -2602,13 +2602,6 @@ SELECT * FROM t1 


DROP TABLE t1,t2,t3;



#

# Bug#20835 (literal string with =any values)

#

CREATE TABLE t1 (s1 char(1));

INSERT INTO t1 VALUES ('a');

SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);

DROP TABLE t1;

#                                                                             

# Bug#23800: Outer fields in correlated subqueries is used in a temporary     

#            table created for sorting.
@@ -2748,3 +2741,33 @@ SELECT * FROM (SELECT 'this is ' 'a test.' AS col1, a AS t2 FROM t1) t; 


DROP table t1;



#

# Bug #27257: COUNT(*) aggregated in outer query

#  



CREATE TABLE t1 (a int, b int);

CREATE TABLE t2 (m int, n int);

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

INSERT INTO t2 VALUES (1,11), (2,22), (3,32), (4,44), (4,44);



SELECT COUNT(*), a,

       (SELECT m FROM t2 WHERE m = count(*) LIMIT 1)

  FROM t1 GROUP BY a;



SELECT COUNT(*), a,

       (SELECT MIN(m) FROM t2 WHERE m = count(*))

  FROM t1 GROUP BY a;



SELECT COUNT(*), a       

  FROM t1 GROUP BY a

    HAVING (SELECT MIN(m) FROM t2 WHERE m = count(*)) > 1;



DROP TABLE t1,t2;



#

# Bug#20835 (literal string with =any values)

#

CREATE TABLE t1 (s1 char(1));

INSERT INTO t1 VALUES ('a');

SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);

DROP TABLE t1;

mysql-test/t/subselect3.test

+41 −0
Original line number Diff line number Diff line
@@ -489,3 +489,44 @@ select a, b, (a,b) in (select a, min(b) from t2 group by a) Z from t1; 


drop table t1,t2;



#

# Bug #24484: Aggregate function used in column list subquery gives erroneous 

# error

#

CREATE TABLE t1 (a int, b INT, c CHAR(10) NOT NULL, PRIMARY KEY (a, b));

INSERT INTO t1 VALUES (1,1,'a'), (1,2,'b'), (1,3,'c'), (1,4,'d'), (1,5,'e'),

  (2,1,'f'), (2,2,'g'), (2,3,'h'), (3,4,'i'),(3,3,'j'), (3,2,'k'), (3,1,'l'),

  (1,9,'m');

CREATE TABLE t2 (a int, b INT, c CHAR(10) NOT NULL, PRIMARY KEY (a, b));

INSERT INTO t2 SELECT * FROM t1;



# Gives error, but should work since it is (a, b) is the PK so only one 

# given match possible

SELECT a, MAX(b), (SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b))

  as test FROM t1 GROUP BY a;

SELECT * FROM t1 GROUP by t1.a

  HAVING (MAX(t1.b) > (SELECT MAX(t2.b) FROM t2 WHERE t2.c < t1.c

                                                HAVING MAX(t2.b+t1.a) < 10));

SELECT a, AVG(b), (SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=AVG(t1.b))

  AS test FROM t1 GROUP BY a;



SELECT a,b,c FROM t1 WHERE b in (9,3,4) ORDER BY b,c;



SELECT a, MAX(b),

 (SELECT COUNT(DISTINCT t.c) FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b) 

  LIMIT 1) 

  as cnt, 

 (SELECT t.b FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b) LIMIT 1) 

  as t_b,

 (SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b) LIMIT 1) 

  as t_b,

 (SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b) ORDER BY t.c LIMIT 1)

  as t_b

 FROM t1 GROUP BY a;



SELECT a, MAX(b),

 (SELECT t.c FROM t1 AS t WHERE t1.a=t.a AND t.b=MAX(t1.b) LIMIT 1) as test 

 FROM t1 GROUP BY a;





DROP TABLE t1, t2;