diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2006-11-29 17:25:23 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2006-11-29 17:25:23 +0200 |
| commit | 6ae9e9a57c7db29c5bc7214592fc27e901c8206d (patch) | |
| tree | ff98751356d1d8efd5d39454189c006ce366502d /sql/item_sum.cc | |
| parent | ea7559ceab379e15eb259043ad5effb292c294cf (diff) | |
| parent | 129a48b0b94e95e1a5750b496469a2089d14dc8b (diff) | |
| download | mariadb-git-6ae9e9a57c7db29c5bc7214592fc27e901c8206d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/item_sum.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index c2219aafd03..9de49df067c 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3409,8 +3409,8 @@ bool Item_func_group_concat::setup(THD *thd) duplicate values (according to the syntax of this function). If there is no DISTINCT or ORDER BY clauses, we don't create this tree. */ - init_tree(tree, min(thd->variables.max_heap_table_size, - thd->variables.sortbuff_size/16), 0, + init_tree(tree, (uint) min(thd->variables.max_heap_table_size, + thd->variables.sortbuff_size/16), 0, tree_key_length, compare_key, 0, NULL, (void*) this); } |