diff options
| author | sergefp@mysql.com <> | 2005-07-12 16:30:45 +0000 |
|---|---|---|
| committer | sergefp@mysql.com <> | 2005-07-12 16:30:45 +0000 |
| commit | 55e70fd1f66cfd259d382e422c60d01cd914e05a (patch) | |
| tree | 3ca9612bc0b1d028336ef2672e7d24505bac79f2 /sql/item.cc | |
| parent | 1042a275fe50e0939ca7f28e268be8dab8fefd9f (diff) | |
| download | mariadb-git-55e70fd1f66cfd259d382e422c60d01cd914e05a.tar.gz | |
Fix for BUG#11821: Make Item_type_holder be able to work with MIN(field),
MAX(field).
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index c96794ff482..3bdaf856f2a 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -3121,9 +3121,13 @@ void Item_type_holder::get_full_info(Item *item) if (fld_type == MYSQL_TYPE_ENUM || fld_type == MYSQL_TYPE_SET) { + if (item->type() == Item::SUM_FUNC_ITEM && + (((Item_sum*)item)->sum_func() == Item_sum::MAX_FUNC || + ((Item_sum*)item)->sum_func() == Item_sum::MIN_FUNC)) + item = ((Item_sum*)item)->args[0]; /* - We can have enum/set type after merging only if we have one enum/set - field and number of NULL fields + We can have enum/set type after merging only if we have one enum|set + field (or MIN|MAX(enum|set field)) and number of NULL fields */ DBUG_ASSERT((enum_set_typelib && get_real_type(item) == MYSQL_TYPE_NULL) || |