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:04:09 sergefp@stripped +3 -0
  Fix for BUG#11821 manually merged

  mysql-test/t/subselect.test
    1.102 05/07/12 17:04:05 sergefp@stripped +25 -0
    Manual merge

  mysql-test/r/subselect.result
    1.118 05/07/12 17:04:05 sergefp@stripped +7 -111
    Manual merge

  sql/item.cc
    1.149 05/07/12 17:00: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:00: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:04:05 +00:00
@@ -2709,78 +2709,8 @@
 ERROR 21000: Operand should contain 3 column(s)
 select (select * from t1) = (1,2,3);
 ERROR 21000: Operand should contain 2 column(s)
-drop table t1;
-create table t1 (df decimal(5,1));
-insert into t1 values(1.1);
-insert into t1 values(2.2);
-select * from t1 where df <= all (select avg(df) from t1 group by df);
-df
-1.1
-select * from t1 where df >= all (select avg(df) from t1 group by df);
-df
-2.2
-drop table t1;
-create table t1 (df decimal(5,1));
-insert into t1 values(1.1);
-select 1.1 * exists(select * from t1);
-1.1 * exists(select * from t1)
-1.1
-drop table t1;
-CREATE TABLE t1 (
-grp int(11) default NULL,
-a decimal(10,2) default NULL);
-insert into t1 values (1, 1), (2, 2), (2, 3), (3, 4), (3, 5), (3, 6), (NULL, NULL);
-select * from t1;
-grp	a
-1	1.00
-2	2.00
-2	3.00
-3	4.00
-3	5.00
-3	6.00
-NULL	NULL
-select min(a) from t1 group by grp;
-min(a)
-NULL
-1.00
-2.00
-4.00
-drop table t1;
-CREATE table t1 ( c1 integer );
-INSERT INTO t1 VALUES ( 1 );
-INSERT INTO t1 VALUES ( 2 );
-INSERT INTO t1 VALUES ( 3 );
-CREATE TABLE t2 ( c2 integer );
-INSERT INTO t2 VALUES ( 1 );
-INSERT INTO t2 VALUES ( 4 );
-INSERT INTO t2 VALUES ( 5 );
-SELECT * FROM t1 LEFT JOIN t2 ON c1 = c2 WHERE c2 IN (1);
-c1	c2
-1	1
-SELECT * FROM t1 LEFT JOIN t2 ON c1 = c2
-WHERE c2 IN ( SELECT c2 FROM t2 WHERE c2 IN ( 1 ) );
-c1	c2
-1	1
-DROP TABLE t1,t2;
-CREATE TABLE t1 ( c1 integer );
-INSERT INTO t1 VALUES ( 1 );
-INSERT INTO t1 VALUES ( 2 );
-INSERT INTO t1 VALUES ( 3 );
-INSERT INTO t1 VALUES ( 6 );
-CREATE TABLE t2 ( c2 integer );
-INSERT INTO t2 VALUES ( 1 );
-INSERT INTO t2 VALUES ( 4 );
-INSERT INTO t2 VALUES ( 5 );
-INSERT INTO t2 VALUES ( 6 );
-CREATE TABLE t3 ( c3 integer );
-INSERT INTO t3 VALUES ( 7 );
-INSERT INTO t3 VALUES ( 8 );
-SELECT c1,c2 FROM t1 LEFT JOIN t2 ON c1 = c2 
-WHERE EXISTS (SELECT c3 FROM t3 WHERE c2 IS NULL );
-c1	c2
-2	NULL
-3	NULL
-DROP TABLE t1,t2,t3;
+drop table t1
+#;
 CREATE TABLE `t1` (
 `itemid` bigint(20) unsigned NOT NULL auto_increment,
 `sessionid` bigint(20) unsigned default NULL,
@@ -2803,37 +2733,9 @@
 ip	count( e.itemid )
 10.10.10.1	1
 drop tables t1,t2;
-CREATE TABLE t1 (EMPNUM   CHAR(3));
-CREATE TABLE t2 (EMPNUM   CHAR(3) );
-INSERT INTO t1 VALUES ('E1'),('E2');
-INSERT INTO t2 VALUES ('E1');
-DELETE FROM t1
-WHERE t1.EMPNUM NOT IN
-(SELECT t2.EMPNUM
-FROM t2
-WHERE t1.EMPNUM = t2.EMPNUM);
-select * from t1;
-EMPNUM
-E1
-DROP TABLE t1,t2;
-CREATE TABLE t1(select_id BIGINT, values_id BIGINT);
-INSERT INTO t1 VALUES (1, 1);
-CREATE TABLE t2 (select_id BIGINT, values_id BIGINT, 
-PRIMARY KEY(select_id,values_id));
-INSERT INTO t2 VALUES (0, 1), (0, 2), (0, 3), (1, 5);
-SELECT values_id FROM t1 
-WHERE values_id IN (SELECT values_id FROM t2
-WHERE select_id IN (1, 0));
-values_id
+create table t1 (fld enum('0','1'));
+insert into t1 values ('1');
+select * from (select max(fld) from t1) as foo;
+max(fld)
 1
-SELECT values_id FROM t1 
-WHERE values_id IN (SELECT values_id FROM t2
-WHERE select_id BETWEEN 0 AND 1);
-values_id
-1
-SELECT values_id FROM t1 
-WHERE values_id IN (SELECT values_id FROM t2
-WHERE select_id = 0 OR select_id = 1);
-values_id
-1
-DROP TABLE t1, t2;
+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:04:05 +00:00
@@ -1726,6 +1726,39 @@
 select (1,2,3) = (select * from t1);
 -- error 1241
 select (select * from t1) = (1,2,3);
+drop table t1
+
+#
+# Item_int_with_ref check (BUG#10020)
+#
+CREATE TABLE `t1` (
+  `itemid` bigint(20) unsigned NOT NULL auto_increment,
+  `sessionid` bigint(20) unsigned default NULL,
+  `time` int(10) unsigned NOT NULL default '0',
+  `type` set('A','D','E','F','G','I','L','N','U') collate latin1_general_ci NOT
+NULL default '',
+  `data` text collate latin1_general_ci NOT NULL,
+  PRIMARY KEY  (`itemid`)
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+INSERT INTO `t1` VALUES (1, 1, 1, 'D', '');
+CREATE TABLE `t2` (
+  `sessionid` bigint(20) unsigned NOT NULL auto_increment,
+  `pid` int(10) unsigned NOT NULL default '0',
+  `date` int(10) unsigned NOT NULL default '0',
+  `ip` varchar(15) collate latin1_general_ci NOT NULL default '',
+  PRIMARY KEY  (`sessionid`)
+) DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+INSERT INTO `t2` VALUES (1, 1, 1, '10.10.10.1');
+SELECT s.ip, count( e.itemid ) FROM `t1` e JOIN t2 s ON s.sessionid = e.sessionid WHERE
e.sessionid = ( SELECT sessionid FROM t2 ORDER BY sessionid DESC LIMIT 1 ) GROUP BY s.ip
HAVING count( e.itemid ) >0 LIMIT 0 , 30;
+drop tables 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;
+
 drop table t1;
 
 #