diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2008-02-28 13:31:19 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2008-02-28 13:31:19 +0200 |
| commit | f28612eae272fb56f9bb07bddf31852882af7ed8 (patch) | |
| tree | 3a08d6d15a1418bf0adfa48f246ca27e23b2dce0 /sql/item_sum.cc | |
| parent | 87007702fe6348de943a825e81f8d8f4bbb1af5a (diff) | |
| download | mariadb-git-f28612eae272fb56f9bb07bddf31852882af7ed8.tar.gz | |
Bug #34747: crash in debug assertion check after derived table
Was a double-free of the Unique member of Item_func_group_concat.
This was not causing a crash because the Unique is a descendent of
Sql_alloc.
Fixed to free the Unique only if it was allocated for the instance
of Item_func_group_concat it was referenced from
mysql-test/r/func_gconcat.result:
Bug #34747: test case
mysql-test/t/func_gconcat.test:
Bug #34747: test case
sql/item_sum.cc:
Bug #34747: free the Unique only if it was allocated
for this instance of Item_func_group_concat
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 47a7073c2e7..3d6d46ab3f4 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3460,6 +3460,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; } |