diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2008-05-01 14:54:59 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2008-05-01 14:54:59 +0300 |
| commit | 0e287a9c9c6b70d88f689405f6c9707de227911d (patch) | |
| tree | d8de038593d4fc21b7405dbc5f0f940b97ab6577 /sql/item_sum.cc | |
| parent | 368542d47b6fd2996d8a3eaf73f9c6f002b9b379 (diff) | |
| parent | 1a68ec2809726e12f148a07cf3771c3d73d9983e (diff) | |
| download | mariadb-git-0e287a9c9c6b70d88f689405f6c9707de227911d.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/B35298-5.0-bugteam
into magare.gmz:/home/kgeorge/mysql/work/B35298-5.1-bugteam
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
sql/item_sum.cc:
Auto merged
configure.in:
merge 5.0-bugteam to 5.1-bugteam
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 264b53c780a..96f0b6a142d 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3256,7 +3256,7 @@ void Item_func_group_concat::clear() no_appended= TRUE; if (tree) reset_tree(tree); - if (distinct) + if (unique_filter) unique_filter->reset(); /* No need to reset the table as we never call write_row */ } |