Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/item_subselect.cc:
  Auto merged

mysql-test/r/subselect.result

@@ -1012,3 +1012,13 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 2	UNCACHEABLE SUBSELECT	t1	ALL	NULL	NULL	NULL	NULL	3	
 3	UNCACHEABLE SUBSELECT	t1	ALL	NULL	NULL	NULL	NULL	3	
 drop table t1;
+CREATE TABLE `t1` (
+`i` int(11) NOT NULL default '0',
+PRIMARY KEY  (`i`)
+) TYPE=MyISAM CHARSET=latin1;
+INSERT INTO t1 VALUES (1);
+UPDATE t1 SET i=i+(SELECT MAX(i) FROM (SELECT 1) t) WHERE i=(SELECT MAX(i));
+Invalid use of group function
+UPDATE t1 SET i=i+1 WHERE i=(SELECT MAX(i));
+Invalid use of group function
+drop table t1;

mysql-test/t/subselect.test

@@ -595,3 +595,15 @@ insert into t1 values (1), (2), (3);
 explain select a,(select (select rand() from t1 limit 1)  from t1 limit 1)
 from t1;
 drop table t1;
+
+CREATE TABLE `t1` (
+  `i` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`i`)
+) TYPE=MyISAM CHARSET=latin1;
+
+INSERT INTO t1 VALUES (1);
+-- error 1111
+UPDATE t1 SET i=i+(SELECT MAX(i) FROM (SELECT 1) t) WHERE i=(SELECT MAX(i));
+-- error 1111
+UPDATE t1 SET i=i+1 WHERE i=(SELECT MAX(i));
+drop table t1;

sql/item_subselect.cc

@@ -88,7 +88,14 @@ bool Item_subselect::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
     if (have_to_be_excluded)
       engine->exclude();
     substitution= 0;
-    return (*ref)->fix_fields(thd, tables, ref);
+    int ret= (*ref)->fix_fields(thd, tables, ref);
+    // We can't substitute aggregate functions (like (SELECT (max(i)))
+    if ((*ref)->with_sum_func)
+    {
+      my_error(ER_INVALID_GROUP_FUNC_USE, MYF(0));
+      return 1;
+    }
+    return ret;
   }
 
   char const *save_where= thd->where;