diff options
| author | unknown <monty@narttu.mysql.fi> | 2006-11-29 23:07:15 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2006-11-29 23:07:15 +0200 |
| commit | c0c013e5b75b88081b6a8a693a777aaf6a574a66 (patch) | |
| tree | 0db898dfb17cf8ad28801621ce4c81f19c7e9cc9 /sql/item_sum.cc | |
| parent | 6bcbd7df1e3402fbc8b6730868115a2bb253f7a7 (diff) | |
| parent | 42fd48da99b2ba2641697ebb567af555fb270e9e (diff) | |
| download | mariadb-git-c0c013e5b75b88081b6a8a693a777aaf6a574a66.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
BitKeeper/etc/ignore:
auto-union
include/heap.h:
Auto merged
include/my_pthread.h:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/type_bit.result:
Auto merged
sql/item_sum.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/heap/ha_heap.cc:
Auto merged
mysys/my_thr_init.c:
Manual merge
sql/mysqld.cc:
Manual merge
sql/sql_class.h:
Manual merge
sql/table.cc:
Manual merge
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 ea6a950f07c..dbab465bef2 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3430,8 +3430,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); } |