database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-03 20:43:11 +03:00
Code Activity

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

Browse Source 
into  magare.gmz:/home/kgeorge/mysql/autopush/B34747-5.0-opt
This commit is contained in:
gkodinov/kgeorge@magare.gmz
2008-02-28 15:27:50 +02:00
parent 67a9d33a3d 0443189d89
commit c8476efc7c
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/r/func_gconcat.result
View File

@@ -931,4 +931,19 @@ SELECT GROUP_CONCAT(DISTINCT b, a ORDER BY b) FROM t1;
GROUP_CONCAT(DISTINCT b, a ORDER BY b) GROUP_CONCAT(DISTINCT b, a ORDER BY b)
11,22,32 11,22,32
DROP TABLE t1, t2, t3; 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 End of 5.0 tests

17
mysql-test/t/func_gconcat.test
View File

@@ -640,4 +640,21 @@ SELECT GROUP_CONCAT(DISTINCT b, a ORDER BY b) FROM t1;
DROP TABLE t1, t2, t3; 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 --echo End of 5.0 tests

2
sql/item_sum.cc
View File

@@ -3460,6 +3460,6 @@ void Item_func_group_concat::print(String *str)
Item_func_group_concat::~Item_func_group_concat() Item_func_group_concat::~Item_func_group_concat()
{ {
if (unique_filter) if (!original && unique_filter)
delete unique_filter; delete unique_filter;
} }