diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-12 16:18:07 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-12 16:42:05 +0200 |
| commit | 0da39caceea7733a94d898427d63ba2670160af4 (patch) | |
| tree | aafaf868a5f42ef760759bb4a42e51cea5fe30d4 /sql | |
| parent | 347eeefbfc658c8531878218487d729f4e020805 (diff) | |
| download | mariadb-git-0da39caceea7733a94d898427d63ba2670160af4.tar.gz | |
fix BIGINT+MEDIUMINT type aggregationmariadb-5.5.52
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index a0686fb2f19..878e3d305af 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -359,7 +359,7 @@ static enum_field_types field_types_merge_rules [FIELDTYPE_NUM][FIELDTYPE_NUM]= //MYSQL_TYPE_NULL MYSQL_TYPE_TIMESTAMP MYSQL_TYPE_LONGLONG, MYSQL_TYPE_VARCHAR, //MYSQL_TYPE_LONGLONG MYSQL_TYPE_INT24 - MYSQL_TYPE_LONGLONG, MYSQL_TYPE_LONG, + MYSQL_TYPE_LONGLONG, MYSQL_TYPE_LONGLONG, //MYSQL_TYPE_DATE MYSQL_TYPE_TIME MYSQL_TYPE_VARCHAR, MYSQL_TYPE_VARCHAR, //MYSQL_TYPE_DATETIME MYSQL_TYPE_YEAR |