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.h | |
| parent | 0775a7122250c8cf9d8e61dcd24ea0a17921a387 (diff) | |
| download | mariadb-git-b30d80e826cfe4925e381ab79e7342e0a5486e94.tar.gz | |
Post merge fix
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index 77b6ac57e79..f4ff257aa4e 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -1121,10 +1121,10 @@ public: virtual Item_result result_type () const { return STRING_RESULT; } enum_field_types field_type() const { - if (max_length/collation.collation->mbmaxlen > CONVERT_IF_BIGGER_TO_BLOB) + if (max_length/collation.collation->mbmaxlen > CONVERT_IF_BIGGER_TO_BLOB ) return FIELD_TYPE_BLOB; else - return MYSQL_TYPE_VAR_STRING; + return MYSQL_TYPE_VARCHAR; } void clear(); bool add(); |