Commit c8476efc authored by gkodinov/kgeorge@magare.gmz's avatar gkodinov/kgeorge@magare.gmz
Browse files

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  magare.gmz:/home/kgeorge/mysql/autopush/B34747-5.0-opt
parents 67a9d33a 0443189d

mysql-test/r/func_gconcat.result

+15 −0
Original line number Diff line number Diff line
@@ -931,4 +931,19 @@ SELECT GROUP_CONCAT(DISTINCT b, a ORDER BY b) FROM t1; 
GROUP_CONCAT(DISTINCT b, a ORDER BY b)

11,22,32

DROP TABLE t1, t2, t3;

CREATE TABLE t1(a INT);

INSERT INTO t1 VALUES (),();

SELECT s1.d1 FROM

(

SELECT

t1.a as d1,

GROUP_CONCAT(DISTINCT t1.a) AS d2

FROM

t1 AS t1,

t1 AS t2

GROUP BY 1

) AS s1;

d1

NULL

DROP TABLE t1;

End of 5.0 tests

mysql-test/t/func_gconcat.test

+17 −0
Original line number Diff line number Diff line
@@ -640,4 +640,21 @@ SELECT GROUP_CONCAT(DISTINCT b, a ORDER BY b) FROM t1; 


DROP TABLE t1, t2, t3;



#

# Bug #34747: crash in debug assertion check after derived table

#

CREATE TABLE t1(a INT);

INSERT INTO t1 VALUES (),();

SELECT s1.d1 FROM

(

 SELECT

  t1.a as d1,

  GROUP_CONCAT(DISTINCT t1.a) AS d2

 FROM

  t1 AS t1,

  t1 AS t2

 GROUP BY 1

) AS s1;

DROP TABLE t1;



--echo End of 5.0 tests

sql/item_sum.cc

+1 −1
Original line number Diff line number Diff line
@@ -3460,6 +3460,6 @@ void Item_func_group_concat::print(String *str) 


Item_func_group_concat::~Item_func_group_concat()

{

  if (unique_filter) 

  if (!original && unique_filter)

    delete unique_filter;    

}