Commit 9bbd385a authored by unknown's avatar unknown
Browse files

Fix for bug #25834: Test failure in "func_group" 

Round the results of std() for some calls with double arguments
to avoid double math precision problems.
parent f80babd6

mysql-test/r/func_group.result

+15 −15
Original line number Diff line number Diff line
@@ -1180,11 +1180,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
@@ -1206,11 +1206,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
@@ -1231,11 +1231,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

+3 −3
Original line number Diff line number Diff line
@@ -747,7 +747,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;
@@ -755,14 +755,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;