bk commit into 5.0 tree (holyfoot:1.1999)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 repository of hf. When hf 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
  1.1999 06/01/21 21:50:54 holyfoot@stripped +2 -0
  Merging

  mysql-test/r/type_float.result
    1.44 06/01/21 21:02:11 hf@stripped +4 -4
    merging

  mysql-test/r/func_gconcat.result
    1.52 06/01/21 21:02:11 hf@stripped +3 -3
    merging

# 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:	holyfoot
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/hf/work/mysql-5.0.mrg

--- 1.43/mysql-test/r/type_float.result	Sat Jan 21 18:50:01 2006
+++ 1.44/mysql-test/r/type_float.result	Sat Jan 21 21:02:11 2006
@@ -245,22 +245,22 @@ show warnings;
 Level	Code	Message
 desc  t1;
 Field	Type	Null	Key	Default	Extra
-x	double			0	
+x	decimal(21,2) unsigned	NO		0.00	
 drop table t1;
 create table t1 select 0.0 x;
 desc t1;
 Field	Type	Null	Key	Default	Extra
-x	double(3,1)			0.0	
+x	decimal(2,1) unsigned	NO		0.0	
 create table t2 select 105213674794682365.00 y;
 desc t2;
 Field	Type	Null	Key	Default	Extra
-y	double(21,2)			0.00	
+y	decimal(20,2) unsigned	NO		0.00	
 create table t3 select x+y a from t1,t2;
 show warnings;
 Level	Code	Message
 desc t3;
 Field	Type	Null	Key	Default	Extra
-a	double			0	
+a	decimal(21,2) unsigned	NO		0.00	
 drop table t1,t2,t3;
 create table t1 (s1 float(0,2));
 ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 's1').

--- 1.51/mysql-test/r/func_gconcat.result	Sat Jan 21 18:39:32 2006
+++ 1.52/mysql-test/r/func_gconcat.result	Sat Jan 21 21:02:11 2006
@@ -131,9 +131,9 @@ grp	group_concat(a separator "")+0
 3	456789
 select grp, group_concat(a separator "")+0.0 from t1 group by grp;
 grp	group_concat(a separator "")+0.0
-1	1
-2	23
-3	456789
+1	1.0
+2	23.0
+3	456789.0
 select grp, ROUND(group_concat(a separator "")) from t1 group by grp;
 grp	ROUND(group_concat(a separator ""))
 1	1