diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2008-02-28 15:45:54 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2008-02-28 15:45:54 +0200 |
| commit | 9a19de7a7f8a0158c461ded17e2f7534de7cc4da (patch) | |
| tree | 528dec167e7d5b69f4dd33fe0f0425da06e0a884 /sql/item_sum.cc | |
| parent | 9c0ee58fc4db70b2189902beec1e9056213cde3f (diff) | |
| parent | f28612eae272fb56f9bb07bddf31852882af7ed8 (diff) | |
| download | mariadb-git-9a19de7a7f8a0158c461ded17e2f7534de7cc4da.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/B34747-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B34747-5.1-opt
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/subselect.result:
merged bug 34747 and 33266 5.0-opt->5.1-opt
mysql-test/t/subselect.test:
merged bug 34747 and 33266 5.0-opt->5.1-opt
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 d7b945cbd50..96effc36485 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3494,6 +3494,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; } |