diff options
| author | unknown <df@kahlann.erinye.com> | 2006-12-01 10:39:48 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2006-12-01 10:39:48 +0100 |
| commit | cf245c8f3a5c285af6e53a0035d05262ea5fbe31 (patch) | |
| tree | 64ea9b0e817c69d36e0263d377d1d828ed553be9 /sql/item_sum.cc | |
| parent | 5176be8db85e2fbc3e33a35bb6f02905fdf3ede9 (diff) | |
| parent | b6004e6295717c3b616b58416544557bd858afca (diff) | |
| download | mariadb-git-cf245c8f3a5c285af6e53a0035d05262ea5fbe31.tar.gz | |
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.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 1ac872b6c07..7ea13e61c23 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3434,8 +3434,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); } |