Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
This commit is contained in:
commit
5ede4696d0
@ -188,7 +188,7 @@ Item_sum_hybrid::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
|
||||
max_length=float_length(decimals);
|
||||
else
|
||||
{
|
||||
str_cmp_function= binary() ? stringcmp : sortcmp;
|
||||
str_cmp_function= item->binary() ? stringcmp : sortcmp;
|
||||
max_length=item->max_length;
|
||||
}
|
||||
decimals=item->decimals;
|
||||
|
Loading…
x
Reference in New Issue
Block a user