bk commit into 5.0 tree (sergefp:1.1913) BUG#11821

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1913 05/07/12 17:11:24 sergefp@stripped +3 -0
  Fix for BUG#11821 manually merged

  mysql-test/t/subselect.test
    1.102 05/07/12 17:11:21 sergefp@stripped +8 -8
    Fix for BUG#11821 manually merged

  mysql-test/r/subselect.result
    1.118 05/07/12 17:11:21 sergefp@stripped +6 -6
    Fix for BUG#11821 manually merged

  sql/item.cc
    1.149 05/07/12 17:08:52 sergefp@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.0-bug11821-merge/RESYNC

--- 1.148/sql/item.cc	2005-07-04 00:44:30 +00:00
+++ 1.149/sql/item.cc	2005-07-12 17:08:52 +00:00
@@ -5421,9 +5421,13 @@
   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) ||

--- 1.117/mysql-test/r/subselect.result	2005-06-23 22:30:49 +00:00
+++ 1.118/mysql-test/r/subselect.result	2005-07-12 17:11:21 +00:00
@@ -2837,3 +2837,9 @@
 values_id
 1
 DROP TABLE t1, t2;
+create table t1 (fld enum('0','1'));
+insert into t1 values ('1');
+select * from (select max(fld) from t1) as foo;
+max(fld)
+1
+drop table t1;

--- 1.101/mysql-test/t/subselect.test	2005-06-23 07:27:30 +00:00
+++ 1.102/mysql-test/t/subselect.test	2005-07-12 17:11:21 +00:00
@@ -1859,3 +1859,11 @@
                     WHERE select_id = 0 OR select_id = 1);
 
 DROP TABLE t1, t2;
+
+# BUG#11821 : Select from subselect using aggregate function on an enum
+# segfaults:
+create table t1 (fld enum('0','1'));
+insert into t1 values ('1');
+select * from (select max(fld) from t1) as foo;
+drop table t1;
+