Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item_sum.cc:
  Auto merged

mysql-test/r/func_gconcat.result

@@ -64,25 +64,6 @@ grp	group_concat(a order by a,d+c-ascii(c)-a)
 1	1
 2	2,3
 3	4,5,6,7,8,9
-Warnings:
-Warning	1292	Truncated incorrect DOUBLE value: 'a         '
-Warning	1292	Truncated incorrect DOUBLE value: 'a         '
-Warning	1292	Truncated incorrect DOUBLE value: 'a         '
-Warning	1292	Truncated incorrect DOUBLE value: 'b         '
-Warning	1292	Truncated incorrect DOUBLE value: 'b         '
-Warning	1292	Truncated incorrect DOUBLE value: 'c         '
-Warning	1292	Truncated incorrect DOUBLE value: 'a         '
-Warning	1292	Truncated incorrect DOUBLE value: 'E         '
-Warning	1292	Truncated incorrect DOUBLE value: 'b         '
-Warning	1292	Truncated incorrect DOUBLE value: 'C         '
-Warning	1292	Truncated incorrect DOUBLE value: 'b         '
-Warning	1292	Truncated incorrect DOUBLE value: 'D         '
-Warning	1292	Truncated incorrect DOUBLE value: 'd         '
-Warning	1292	Truncated incorrect DOUBLE value: 'd         '
-Warning	1292	Truncated incorrect DOUBLE value: 'd         '
-Warning	1292	Truncated incorrect DOUBLE value: 'd         '
-Warning	1292	Truncated incorrect DOUBLE value: 'c         '
-Warning	1292	Truncated incorrect DOUBLE value: 'D         '
 select grp,group_concat(a order by d+c-ascii(c),a) from t1 group by grp;
 grp	group_concat(a order by d+c-ascii(c),a)
 1	1

mysql-test/t/func_gconcat.test

@@ -29,7 +29,9 @@ select grp,group_concat(c order by c) from t1 group by grp;
 select grp,group_concat(c order by c desc) from t1 group by grp;
 select grp,group_concat(d order by a) from t1 group by grp;
 select grp,group_concat(d order by a desc) from t1 group by grp;
+--disable_warnings
 select grp,group_concat(a order by a,d+c-ascii(c)-a) from t1 group by grp;
+--enable_warnings
 select grp,group_concat(a order by d+c-ascii(c),a) from t1 group by grp;
 select grp,group_concat(c order by 1) from t1 group by grp;
 select grp,group_concat(distinct c order by c) from t1 group by grp;