diff options
| author | unknown <igor@rurik.mysql.com> | 2006-04-19 18:08:15 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-04-19 18:08:15 -0700 |
| commit | 8e27c3744fb06e4969142a9f13af2ad219b91cb3 (patch) | |
| tree | 3475fbd06f0fb2c8376c6279c435592f58d6324f /sql/item_sum.h | |
| parent | bf8f30b532ef217dac2a168124706d28e19a320f (diff) | |
| parent | e4d653abb8a2b25ca932c75e61e75a97f49bd34c (diff) | |
| download | mariadb-git-8e27c3744fb06e4969142a9f13af2ad219b91cb3.tar.gz | |
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-2
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
mysys/mf_keycache.c:
Auto merged
ndb/src/kernel/SimBlockList.cpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
Auto merged
mysql-test/r/func_gconcat.result:
Manual merge
mysql-test/r/key_cache.result:
Manual merge
mysql-test/t/func_gconcat.test:
Manual merge
mysql-test/t/key_cache.test:
Manual merge
sql/item_func.cc:
Manual merge
sql/item_sum.h:
Manual merge
sql/lock.cc:
Manual merge
sql/sql_select.cc:
Manual merge
sql/unireg.h:
Manual merge
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(); |