Commit 2aeec864 authored by unknown's avatar unknown
Browse files

Merge macbook.gmz:/Users/kgeorge/mysql/work/B16792-4.1-opt 

into  macbook.gmz:/Users/kgeorge/mysql/work/B16792-5.0-opt


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/opt_sum.cc:
  Auto merged
mysql-test/r/func_group.result:
  merge 4.1->5.0 for bug #16792
mysql-test/t/func_group.test:
  merge 4.1->5.0 for bug #16792
sql/sql_select.cc:
  merge 4.1->5.0 for bug #16792
parents 09df2612 d3dd6fa0

mysql-test/r/func_gconcat.result

+2 −2
Original line number Diff line number Diff line
@@ -566,14 +566,14 @@ COUNT(*) GROUP_CONCAT(DISTINCT t2.somename SEPARATOR ' |') 
DROP TABLE t1,t2;

select * from (select group_concat('c') from DUAL) t;

group_concat('c')

NULL

c

create table t1 ( a int not null default 0);

select * from (select group_concat(a) from t1) t2;

group_concat(a)

NULL

select group_concat('x') UNION ALL select 1;

group_concat('x')

NULL

x

1

drop table t1;

CREATE TABLE t1 (id int, a varchar(9));

mysql-test/r/func_group.result

+16 −0
Original line number Diff line number Diff line
@@ -845,6 +845,22 @@ EXPLAIN SELECT MAX(b) FROM t1; 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	

DROP TABLE t1;

CREATE TABLE t1 (a INT, b INT);

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

SELECT (SELECT COUNT(DISTINCT t1.b)) FROM t1 GROUP BY t1.a;

(SELECT COUNT(DISTINCT t1.b))

1

1

SELECT (SELECT COUNT(DISTINCT 12)) FROM t1 GROUP BY t1.a;

(SELECT COUNT(DISTINCT 12))

1

1

SELECT AVG(2), BIT_AND(2), BIT_OR(2), BIT_XOR(2), COUNT(*), COUNT(12),

COUNT(DISTINCT 12), MIN(2),MAX(2),STD(2), VARIANCE(2),SUM(2),

GROUP_CONCAT(2),GROUP_CONCAT(DISTINCT 2);

AVG(2)	BIT_AND(2)	BIT_OR(2)	BIT_XOR(2)	COUNT(*)	COUNT(12)	COUNT(DISTINCT 12)	MIN(2)	MAX(2)	STD(2)	VARIANCE(2)	SUM(2)	GROUP_CONCAT(2)	GROUP_CONCAT(DISTINCT 2)

2.0000	2	2	2	1	1	1	2	2	0.0000	0.0000	2	2	2

DROP TABLE t1;

CREATE TABLE t1 (id int , b varchar(512), INDEX(b(250))) COLLATE latin1_bin;

INSERT INTO t1 VALUES

(1,CONCAT(REPEAT('_', 250), "qq")), (1,CONCAT(REPEAT('_', 250), "zz")),

mysql-test/r/subselect.result

+2 −2
Original line number Diff line number Diff line
@@ -1011,7 +1011,7 @@ INSERT INTO t1 VALUES (1); 
UPDATE t1 SET i=i+1 WHERE i=(SELECT MAX(i));

select * from t1;

i

1

2

drop table t1;

CREATE TABLE t1 (a int(1));

EXPLAIN EXTENDED SELECT (SELECT RAND() FROM t1) FROM t1;
@@ -1203,7 +1203,7 @@ UPDATE t1 SET t.i=i+(SELECT MAX(i) FROM (SELECT 1) t); 
ERROR 42S22: Unknown column 't.i' in 'field list'

select * from t1;

i

1

3

drop table t1;

CREATE TABLE t1 (

id int(11) default NULL

mysql-test/t/func_group.test

+13 −0
Original line number Diff line number Diff line
@@ -566,6 +566,19 @@ INSERT INTO t1 VALUES 
SELECT MAX(b) FROM t1;

EXPLAIN SELECT MAX(b) FROM t1;

DROP TABLE t1;

#

# Bug #16792  query with subselect, join, and group not returning proper values

#

CREATE TABLE t1 (a INT, b INT);

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



SELECT (SELECT COUNT(DISTINCT t1.b)) FROM t1 GROUP BY t1.a;

SELECT (SELECT COUNT(DISTINCT 12)) FROM t1 GROUP BY t1.a;

# an attempt to test all aggregate function with no table.

SELECT AVG(2), BIT_AND(2), BIT_OR(2), BIT_XOR(2), COUNT(*), COUNT(12),

       COUNT(DISTINCT 12), MIN(2),MAX(2),STD(2), VARIANCE(2),SUM(2),

       GROUP_CONCAT(2),GROUP_CONCAT(DISTINCT 2);

DROP TABLE t1;



# End of 4.1 tests

sql/opt_sum.cc

+2 −2
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds) 
            Type of range for the key part for this field will be

            returned in range_fl.

          */

          if ((outer_tables & table->map) ||

          if (table->file->inited || (outer_tables & table->map) ||

              !find_key_for_maxmin(0, &ref, item_field->field, conds,

                                   &range_fl, &prefix_len))

          {
@@ -278,7 +278,7 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds) 
            Type of range for the key part for this field will be

            returned in range_fl.

          */

          if ((outer_tables & table->map) ||

          if (table->file->inited || (outer_tables & table->map) ||

	          !find_key_for_maxmin(1, &ref, item_field->field, conds,

				                   &range_fl, &prefix_len))

          {