bk commit into 4.1 tree (bar:1.2408)

[bar]

Below is the list of changes that have just been committed into a local
4.1 repository of bar. When bar 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.2408 05/09/07 13:12:29 bar@stripped +3 -0
  Merge abarkov@stripped:/home/bk/mysql-4.1
  into  mysql.com:/usr/home/bar/mysql-4.1.b12829

  sql/item_sum.cc
    1.144 05/09/07 13:12:18 bar@stripped +0 -0
    Auto merged

  mysql-test/t/func_gconcat.test
    1.32 05/09/07 13:12:17 bar@stripped +0 -0
    Auto merged

  mysql-test/r/func_gconcat.result
    1.40 05/09/07 13:12:17 bar@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:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-4.1.b12829/RESYNC

--- 1.143/sql/item_sum.cc	2005-08-30 15:35:05 +05:00
+++ 1.144/sql/item_sum.cc	2005-09-07 13:12:18 +05:00
@@ -1916,7 +1916,7 @@
   }
   
   thd->allow_sum_func= 0;
-  maybe_null= 0;
+  maybe_null= 1;
   item_thd= thd;
 
   /*
@@ -1929,8 +1929,6 @@
          args[i]->fix_fields(thd, tables, args + i)) ||
         args[i]->check_cols(1))
       return 1;
-    if (i < arg_count_field)
-      maybe_null|= args[i]->maybe_null;
   }
 
   if (agg_item_charsets(collation, func_name(),

--- 1.39/mysql-test/r/func_gconcat.result	2005-08-30 15:35:57 +05:00
+++ 1.40/mysql-test/r/func_gconcat.result	2005-09-07 13:12:17 +05:00
@@ -557,3 +557,15 @@
 COUNT(*)	GROUP_CONCAT(DISTINCT t2.somename SEPARATOR ' |')
 2	test
 DROP TABLE t1,t2;
+select * from (select group_concat('c') from DUAL) t;
+group_concat('c')
+NULL
+create table t1 ( a int not null default 0);
+select * from (select group_concat(a) from t1) t2;
+group_concat(a)
+NULL
+select group_concat('x') UNION ALL select 1;
+group_concat('x')
+NULL
+1
+drop table t1;

--- 1.31/mysql-test/t/func_gconcat.test	2005-08-30 15:35:52 +05:00
+++ 1.32/mysql-test/t/func_gconcat.test	2005-09-07 13:12:17 +05:00
@@ -353,4 +353,17 @@
 
 DROP TABLE t1,t2;
 
+#
+# Bug #12861 hang with group_concat insubquery FROM DUAL
+#
+select * from (select group_concat('c') from DUAL) t;
+
+#
+# Bug #12859 group_concat in subquery cause incorrect not null
+#
+create table t1 ( a int not null default 0);
+select * from (select group_concat(a) from t1) t2;
+select group_concat('x') UNION ALL select 1;
+drop table t1;
+
 # End of 4.1 tests