1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt

Browse Source 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
This commit is contained in:
unknown 2007-10-29 14:53:42 +04:00
commit 91ca02ad8a
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -867,4 +867,13 @@ select group_concat(distinct a, c order by a desc, c desc) from t1;
group_concat(distinct a, c order by a desc, c desc) group_concat(distinct a, c order by a desc, c desc)
31,11,10,01,00 31,11,10,01,00
drop table t1; drop table t1;
create table t1 (f1 char(20));
insert into t1 values (''),('');
select group_concat(distinct f1) from t1;
group_concat(distinct f1)
select group_concat(f1) from t1;
group_concat(f1)
,
drop table t1;
End of 5.0 tests End of 5.0 tests

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

@ -590,4 +590,13 @@ select group_concat(distinct a, c order by a desc, c desc) from t1;
drop table t1; drop table t1;
#
# Bug#30897 GROUP_CONCAT returns extra comma on empty fields
#
create table t1 (f1 char(20));
insert into t1 values (''),('');
select group_concat(distinct f1) from t1;
select group_concat(f1) from t1;
drop table t1;
--echo End of 5.0 tests --echo End of 5.0 tests

2
sql/item_sum.cc
View File

@ -3427,7 +3427,7 @@ String* Item_func_group_concat::val_str(String* str)
DBUG_ASSERT(fixed == 1); DBUG_ASSERT(fixed == 1);
if (null_value) if (null_value)
return 0; return 0;
if (!result.length() && tree) if (no_appended && tree)
/* Tree is used for sorting as in ORDER BY */ /* Tree is used for sorting as in ORDER BY */
tree_walk(tree, (tree_walk_action)&dump_leaf_key, (void*)this, tree_walk(tree, (tree_walk_action)&dump_leaf_key, (void*)this,
left_root_right); left_root_right);