summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@magare.gmz>2008-05-01 13:49:26 +0300
committerunknown <gkodinov/kgeorge@magare.gmz>2008-05-01 13:49:26 +0300
commit1a68ec2809726e12f148a07cf3771c3d73d9983e (patch)
treee158fef65a70f1ba06651b8abccf9b1318ae3856 /sql/sql_parse.cc
parentcf2b2cc506a8933ccaaf271e228bb9f6b70531ac (diff)
downloadmariadb-git-1a68ec2809726e12f148a07cf3771c3d73d9983e.tar.gz
Fix for bug #35298: GROUP_CONCAT with DISTINCT can crash the server
The bug is a regression introduced by the patch for bug32798. The code in Item_func_group_concat::clear() relied on the 'distinct' variable to check if 'unique_filter' was initialized. That, however, is not always valid because Item_func_group_concat::setup() can do shortcuts in some cases w/o initializing 'unique_filter'. Fixed by checking the value of 'unique_filter' instead of 'distinct' before dereferencing. mysql-test/r/func_gconcat.result: Added test cases for bugs #35298 and #36024. mysql-test/t/func_gconcat.test: Added test cases for bugs #35298 and #36024. sql/item_sum.cc: Check if unique_filter != NULL before dereferencing it. Non-zero value of distinct does not always mean that unique_filter is initialized because Item_func_group_concat::setup() can do shortcuts is some cases
Diffstat (limited to 'sql/sql_parse.cc')
0 files changed, 0 insertions, 0 deletions