Merge siva.hindu.god:/usr/home/tim/m/bk/50

into  siva.hindu.god:/usr/home/tim/m/bk/51

BitKeeper/etc/collapsed

@@ -15,6 +15,8 @@
 45214442pBGT9KuZEGixBH71jTzbOA
 45214a07hVsIGwvwa-WrO-jpeaSwVw
 452a92d0-31-8wSzSfZi165fcGcXPA
+452c6c6dAjuNghfc1ObZ_UQ5SCl85g
+4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg
 454a7ef8gdvE_ddMlJyghvOAkKPNOQ
 454bb488ijVLOUK_GFjcoISE0GxPUA
 454bb9a8AwlGRC_wWLS2sNMoRBMRGw

mysql-test/r/func_group.result

@@ -1207,15 +1207,15 @@ i	count(*)	std(e1/e2)
 1	4	0.000000000000000000000000000000
 2	4	0.000000000000000000000000000000
 3	4	0.000000000000000000000000000000
-select std(s1/s2) from bug22555;
-std(s1/s2)
-0.213257635866493405751853629226
+select round(std(s1/s2), 17) from bug22555;
+round(std(s1/s2), 17)
+0.21325763586649341
 select std(o1/o2) from bug22555;
 std(o1/o2)
 0.21325763586649
-select std(e1/e2) from bug22555;
-std(e1/e2)
-0.213257635866493405751853629226
+select round(std(e1/e2), 17) from bug22555;
+round(std(e1/e2), 17)
+0.21325763586649341
 set div_precision_increment=20;
 select i, count(*), std(s1/s2) from bug22555 group by i order by i;
 i	count(*)	std(s1/s2)
@@ -1232,15 +1232,15 @@ i	count(*)	std(e1/e2)
 1	4	0.000000000000000000000000000000
 2	4	0.000000000000000000000000000000
 3	4	0.000000000000000000000000000000
-select std(s1/s2) from bug22555;
-std(s1/s2)
-0.213257635866493405751853629226
+select round(std(s1/s2), 17) from bug22555;
+round(std(s1/s2), 17)
+0.21325763586649341
 select std(o1/o2) from bug22555;
 std(o1/o2)
 0.21325763586649
-select std(e1/e2) from bug22555;
-std(e1/e2)
-0.213257635866493405751853629226
+select round(std(e1/e2), 17) from bug22555;
+round(std(e1/e2), 17)
+0.21325763586649341
 set @@div_precision_increment=@saved_div_precision_increment;
 drop table bug22555;
 create table bug22555 (s smallint, o double, e decimal);

mysql-test/t/func_group.test

@@ -764,16 +764,16 @@ 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(*), std(e1/e2) from bug22555 group by i order by i;
-select std(s1/s2) from bug22555;
+select round(std(s1/s2), 17) from bug22555;
 select std(o1/o2) from bug22555;
-select std(e1/e2) 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(*), std(e1/e2) from bug22555 group by i order by i;
-select std(s1/s2) from bug22555;
+select round(std(s1/s2), 17) from bug22555;
 select std(o1/o2) from bug22555;
-select std(e1/e2) from bug22555;
+select round(std(e1/e2), 17) from bug22555;
 set @@div_precision_increment=@saved_div_precision_increment;
 drop table bug22555;