bk commit into 5.1 tree (tsmith:1.2389)

[tim]

Below is the list of changes that have just been committed into a local
5.1 repository of tim. When tim does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-12-26 12:43:57-07:00, tsmith@stripped +5 -0
  Merge siva.hindu.god:/usr/home/tim/m/bk/50
  into  siva.hindu.god:/usr/home/tim/m/bk/51
  MERGE: 1.1810.2359.37

  BitKeeper/etc/collapsed@stripped, 2006-12-26 12:43:42-07:00, tsmith@stripped +2 -1
    auto-union
    MERGE: 1.5.1.14

  mysql-test/r/func_group.result@stripped, 2006-12-26 12:43:50-07:00, tsmith@stripped +0
-0
    Auto merged
    MERGE: 1.49.1.9

  mysql-test/t/func_group.test@stripped, 2006-12-26 12:43:50-07:00, tsmith@stripped +0
-2
    Auto merged
    MERGE: 1.48.1.5

  sql/item_sum.cc@stripped, 2006-12-26 12:43:50-07:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.170.1.23

  sql/item_sum.h@stripped, 2006-12-26 12:43:51-07:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.102.1.6

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tsmith
# Host:	siva.hindu.god
# Root:	/usr/home/tim/m/bk/51/RESYNC

--- 1.23/BitKeeper/etc/collapsed	2006-12-26 12:44:05 -07:00
+++ 1.24/BitKeeper/etc/collapsed	2006-12-26 12:44:05 -07:00
@@ -15,6 +15,8 @@
 45214442pBGT9KuZEGixBH71jTzbOA
 45214a07hVsIGwvwa-WrO-jpeaSwVw
 452a92d0-31-8wSzSfZi165fcGcXPA
+452c6c6dAjuNghfc1ObZ_UQ5SCl85g
+4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg
 454a7ef8gdvE_ddMlJyghvOAkKPNOQ
 454bb488ijVLOUK_GFjcoISE0GxPUA
 454bb9a8AwlGRC_wWLS2sNMoRBMRGw

--- 1.58/mysql-test/r/func_group.result	2006-12-26 12:44:05 -07:00
+++ 1.59/mysql-test/r/func_group.result	2006-12-26 12:44:05 -07:00
@@ -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);

--- 1.53/mysql-test/t/func_group.test	2006-12-26 12:44:05 -07:00
+++ 1.54/mysql-test/t/func_group.test	2006-12-26 12:44:05 -07:00
@@ -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;