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/func_group.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged

mysql-test/r/func_gconcat.result

@@ -69,25 +69,6 @@ grp	group_concat(a order by d+c-ascii(c),a)
 1	1
 2	3,2
 3	7,8,4,6,9,5
-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(c order by 1) from t1 group by grp;
 grp	group_concat(c order by 1)
 1	a

mysql-test/r/func_group.result

@@ -62,13 +62,6 @@ NULL	NULL
 1	7
 2	20.25
 3	45.483163247594
-Warnings:
-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: 'c         '
-Warning	1292	Truncated incorrect DOUBLE value: 'C         '
-Warning	1292	Truncated incorrect DOUBLE value: 'E         '
 create table t2 (grp int, a bigint unsigned, c char(10));
 insert into t2 select grp,max(a)+max(grp),max(c) from t1 group by grp;
 replace into t2 select grp, a, c from t1 limit 2,1;

mysql-test/t/func_gconcat.test

@@ -31,8 +31,8 @@ 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;
+--enable_warnings
 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;
 select grp,group_concat(distinct c order by c desc) from t1 group by grp;

mysql-test/t/func_group.test

@@ -29,7 +29,9 @@ select count(distinct a),count(distinct grp) from t1;
 
 select sum(all a),count(all a),avg(all a),std(all a),variance(all a),bit_or(all a),bit_and(all a),min(all a),max(all a),min(all c),max(all c) from t1;
 select grp, sum(a),count(a),avg(a),std(a),variance(a),bit_or(a),bit_and(a),min(a),max(a),min(c),max(c) from t1 group by grp;
+--disable_warnings
 select grp, sum(a)+count(a)+avg(a)+std(a)+variance(a)+bit_or(a)+bit_and(a)+min(a)+max(a)+min(c)+max(c) as sum from t1 group by grp;
+--enable_warnings
 
 create table t2 (grp int, a bigint unsigned, c char(10));
 insert into t2 select grp,max(a)+max(grp),max(c) from t1 group by grp;