diff options
| author | unknown <ram@mysql.r18.ru> | 2003-02-26 19:23:11 +0400 |
|---|---|---|
| committer | unknown <ram@mysql.r18.ru> | 2003-02-26 19:23:11 +0400 |
| commit | 29a99fa0bee7136d10214d84aa3b484168b60c46 (patch) | |
| tree | dc2dc0d975a191c52bdf40ae8e82b0ae8256c7cc /sql/item_sum.cc | |
| parent | d2b0d3fa88a894c6380e577eaa8d10b81f667566 (diff) | |
| parent | e0100ed8865823b724f899be74a3092db120bbf6 (diff) | |
| download | mariadb-git-29a99fa0bee7136d10214d84aa3b484168b60c46.tar.gz | |
Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
sql/spatial.cc:
Auto merged
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index ae0559e2249..ca6f17d486a 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -188,12 +188,13 @@ 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; maybe_null=item->maybe_null; unsigned_flag=item->unsigned_flag; + set_charset(item->charset()); result_field=0; null_value=1; fix_length_and_dec(); |