diff options
| author | Alexey Botchkov <holyfoot@mysql.com> | 2009-10-01 16:33:30 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@mysql.com> | 2009-10-01 16:33:30 +0500 |
| commit | cd994f0ee4c67e892d35e9f928b67491b0e264b1 (patch) | |
| tree | 2b1a21d049d855543a6f3609598054e7a7e6a44b /sql/item_sum.h | |
| parent | 289f4a4083f8375b0e7520f575730a163ac1c681 (diff) | |
| download | mariadb-git-cd994f0ee4c67e892d35e9f928b67491b0e264b1.tar.gz | |
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
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 1 |
1 files changed, 1 insertions, 0 deletions
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: |