diff options
| author | unknown <gluh@eagle.(none)> | 2007-10-29 14:53:42 +0400 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-10-29 14:53:42 +0400 |
| commit | 91ca02ad8affb8cb0546bc129e84cdc15c21ceef (patch) | |
| tree | 7490fcfcaa349688856f26eec28fcb57f0bd4139 /sql/item_sum.cc | |
| parent | 6b750312422e924ea25b820259538d37af3c7069 (diff) | |
| parent | d5b1d6205b126be933a833f497a8de8854c0666d (diff) | |
| download | mariadb-git-91ca02ad8affb8cb0546bc129e84cdc15c21ceef.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
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
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 0e1daadd8e7..a7574cf4d60 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3427,7 +3427,7 @@ String* Item_func_group_concat::val_str(String* str) DBUG_ASSERT(fixed == 1); if (null_value) return 0; - if (!result.length() && tree) + if (no_appended && tree) /* Tree is used for sorting as in ORDER BY */ tree_walk(tree, (tree_walk_action)&dump_leaf_key, (void*)this, left_root_right); |