bk commit into 5.1 tree (holyfoot:1.2132)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 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.2132 06/02/02 14:00:41 holyfoot@deer.(none) +2 -0
  Merging

  sql/item_func.cc
    1.273 06/02/02 13:59:21 holyfoot@stripped +0 -11
    Merging

  mysql-test/r/func_gconcat.result
    1.52 06/02/02 13:59:21 holyfoot@stripped +3 -3
    Mergign

# 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:	deer.(none)
# Root:	/home/hf/work/mysql-5.1.mrg

--- 1.272/sql/item_func.cc	Wed Feb  1 15:59:41 2006
+++ 1.273/sql/item_func.cc	Thu Feb  2 13:59:21 2006
@@ -429,17 +429,6 @@
 }
 
 
-void Item_func::fix_num_length_and_dec()
-{
-  decimals= 0;
-  for (uint i=0 ; i < arg_count ; i++)
-  {
-    set_if_bigger(decimals, args[i]->decimals);
-  }
-  max_length= float_length(decimals);
-}
-
-
 void Item_func_numhybrid::fix_num_length_and_dec()
 {}
 

--- 1.51/mysql-test/r/func_gconcat.result	Wed Feb  1 15:50:37 2006
+++ 1.52/mysql-test/r/func_gconcat.result	Thu Feb  2 13:59:21 2006
@@ -131,9 +131,9 @@
 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