From cd994f0ee4c67e892d35e9f928b67491b0e264b1 Mon Sep 17 00:00:00 2001 From: Alexey Botchkov Date: Thu, 1 Oct 2009 16:33:30 +0500 Subject: Bug#46018 group_concat(distinct ...) uses max_heap_table_size for memory allocations Use min(max_heap_table_size, tmp_table_size) instead per-file comments: sql/item_sum.cc Bug#46018 group_concat(distinct ...) uses max_heap_table_size for memory allocations Item_sum_**::setup fixed, so they use ram_limitation() for Unique-s they embed sql/item_sum.h Bug#46018 group_concat(distinct ...) uses max_heap_table_size for memory allocations Item_sum::ram_limitation() declared --- sql/item_sum.h | 1 + 1 file changed, 1 insertion(+) (limited to 'sql/item_sum.h') diff --git a/sql/item_sum.h b/sql/item_sum.h index d991327d847..49c3c9892c0 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -256,6 +256,7 @@ protected: Item **orig_args, *tmp_orig_args[2]; table_map used_tables_cache; bool forced_const; + static ulonglong ram_limitation(THD *thd); public: -- cgit v1.2.1