diff options
| author | igor@rurik.mysql.com <> | 2006-04-19 18:08:15 -0700 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2006-04-19 18:08:15 -0700 |
| commit | 27cc6f4bc3be40dc6d6dac3c676193d5c1de3cd5 (patch) | |
| tree | 3475fbd06f0fb2c8376c6279c435592f58d6324f /sql/item_sum.h | |
| parent | 592dc88be75fcad1129e053820bd326aeb114cb4 (diff) | |
| parent | 67458961cf5cf8d50ca9b2b694a84599809b46ec (diff) | |
| download | mariadb-git-27cc6f4bc3be40dc6d6dac3c676193d5c1de3cd5.tar.gz | |
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-2
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index 328f8dd8400..77b6ac57e79 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -1124,7 +1124,7 @@ public: if (max_length/collation.collation->mbmaxlen > CONVERT_IF_BIGGER_TO_BLOB) return FIELD_TYPE_BLOB; else - return MYSQL_TYPE_VARCHAR; + return MYSQL_TYPE_VAR_STRING; } void clear(); bool add(); |