Merge mysql.com:/home/ram/work/b25834/b25834.5.0

into  mysql.com:/home/ram/work/b25834/b25834.5.1


mysql-test/r/func_group.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged

mysql-test/r/func_group.result

@@ -1171,11 +1171,11 @@ i	count(*)	std(s1/s2)
 1	4	0.00000000
 2	4	0.00000000
 3	4	0.00000000
-select i, count(*), std(o1/o2) from bug22555 group by i order by i;
-i	count(*)	std(o1/o2)
-1	4	0
-2	4	0
-3	4	0
+select i, count(*), round(std(o1/o2), 16) from bug22555 group by i order by i;
+i	count(*)	round(std(o1/o2), 16)
+1	4	0.0000000000000000
+2	4	0.0000000000000000
+3	4	0.0000000000000000
 select i, count(*), std(e1/e2) from bug22555 group by i order by i;
 i	count(*)	std(e1/e2)
 1	4	0.00000000
@@ -1197,11 +1197,11 @@ i	count(*)	std(s1/s2)
 1	4	0.000000000000000000000000000000
 2	4	0.000000000000000000000000000000
 3	4	0.000000000000000000000000000000
-select i, count(*), std(o1/o2) from bug22555 group by i order by i;
-i	count(*)	std(o1/o2)
-1	4	0
-2	4	0
-3	4	0
+select i, count(*), round(std(o1/o2), 16) from bug22555 group by i order by i;
+i	count(*)	round(std(o1/o2), 16)
+1	4	0.0000000000000000
+2	4	0.0000000000000000
+3	4	0.0000000000000000
 select i, count(*), std(e1/e2) from bug22555 group by i order by i;
 i	count(*)	std(e1/e2)
 1	4	0.000000000000000000000000000000
@@ -1222,11 +1222,11 @@ i	count(*)	std(s1/s2)
 1	4	0.000000000000000000000000000000
 2	4	0.000000000000000000000000000000
 3	4	0.000000000000000000000000000000
-select i, count(*), std(o1/o2) from bug22555 group by i order by i;
-i	count(*)	std(o1/o2)
-1	4	0
-2	4	0
-3	4	0
+select i, count(*), round(std(o1/o2), 16) from bug22555 group by i order by i;
+i	count(*)	round(std(o1/o2), 16)
+1	4	0.0000000000000000
+2	4	0.0000000000000000
+3	4	0.0000000000000000
 select i, count(*), std(e1/e2) from bug22555 group by i order by i;
 i	count(*)	std(e1/e2)
 1	4	0.000000000000000000000000000000

mysql-test/t/func_group.test

@@ -754,7 +754,7 @@ insert into bug22555 values (1,53,78,53,78,53,78),(2,17,78,17,78,17,78),(3,18,76
 insert into bug22555 values (1,53,78,53,78,53,78),(2,17,78,17,78,17,78),(3,18,76,18,76,18,76);
 
 select i, count(*), std(s1/s2) from bug22555 group by i order by i;
-select i, count(*), std(o1/o2) from bug22555 group by i order by i;
+select i, count(*), round(std(o1/o2), 16) from bug22555 group by i order by i;
 select i, count(*), std(e1/e2) from bug22555 group by i order by i;
 select std(s1/s2) from bug22555;
 select std(o1/o2) from bug22555;
@@ -762,14 +762,14 @@ select std(e1/e2) from bug22555;
 set @saved_div_precision_increment=@@div_precision_increment;
 set div_precision_increment=19;
 select i, count(*), std(s1/s2) from bug22555 group by i order by i;
-select i, count(*), std(o1/o2) from bug22555 group by i order by i;
+select i, count(*), round(std(o1/o2), 16) from bug22555 group by i order by i;
 select i, count(*), std(e1/e2) from bug22555 group by i order by i;
 select round(std(s1/s2), 17) from bug22555;
 select std(o1/o2) from bug22555;
 select round(std(e1/e2), 17) from bug22555;
 set div_precision_increment=20;
 select i, count(*), std(s1/s2) from bug22555 group by i order by i;
-select i, count(*), std(o1/o2) from bug22555 group by i order by i;
+select i, count(*), round(std(o1/o2), 16) from bug22555 group by i order by i;
 select i, count(*), std(e1/e2) from bug22555 group by i order by i;
 select round(std(s1/s2), 17) from bug22555;
 select std(o1/o2) from bug22555;