diff options
| author | unknown <df@kahlann.erinye.com> | 2006-12-01 13:02:54 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2006-12-01 13:02:54 +0100 |
| commit | c06f995ba73834febc971b573a48d7b17dd1a36b (patch) | |
| tree | 90907c9ba079c9a6f4d555883abe4775ee5aa762 /sql/item_sum.cc | |
| parent | 114197b589dcc5612943fb967082f1c1be9d23a9 (diff) | |
| parent | 25226de9ea52d06667c2c7fbd99f5cd014764241 (diff) | |
| download | mariadb-git-c06f995ba73834febc971b573a48d7b17dd1a36b.tar.gz | |
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
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 6d34712ed1a..7b296019709 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3413,8 +3413,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); } |