diff options
| author | unknown <igor@rurik.mysql.com> | 2006-04-20 00:42:12 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-04-20 00:42:12 -0700 |
| commit | b30d80e826cfe4925e381ab79e7342e0a5486e94 (patch) | |
| tree | a71191d4453a2d4235cc3a616d5e9556bc54acd0 /sql/item_sum.cc | |
| parent | 0775a7122250c8cf9d8e61dcd24ea0a17921a387 (diff) | |
| download | mariadb-git-b30d80e826cfe4925e381ab79e7342e0a5486e94.tar.gz | |
Post merge fix
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 8826144266e..962454e237e 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -377,12 +377,12 @@ Field *Item_sum::create_tmp_field(bool group, TABLE *table, case INT_RESULT: return new Field_longlong(max_length,maybe_null,name,table,unsigned_flag); case STRING_RESULT: - if (max_length > 255 && convert_blob_length) + if (max_length/collation.collation->mbmaxlen > 255 && convert_blob_length) return new Field_varstring(convert_blob_length, maybe_null, name, table, collation.collation); return make_string_field(table); - case DECIMAL_RESULT: +case DECIMAL_RESULT: return new Field_new_decimal(max_length, maybe_null, name, table, decimals, unsigned_flag); case ROW_RESULT: |