From b30d80e826cfe4925e381ab79e7342e0a5486e94 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 20 Apr 2006 00:42:12 -0700 Subject: Post merge fix --- sql/item_sum.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/item_sum.h') 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(); -- cgit v1.2.1