bk commit into 5.0 tree (hf:1.1960)

[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.1960 05/10/31 17:51:26 hf@deer.(none) +2 -0
  Additional fix for #14445 (analyse.test fails)

  sql/sql_analyse.cc
    1.65 05/10/31 17:51:17 hf@deer.(none) +1 -1
    precision increased

  mysql-test/r/analyse.result
    1.25 05/10/31 17:51:17 hf@deer.(none) +3 -3
    test result fixed

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

--- 1.64/sql/sql_analyse.cc	Mon Oct 31 16:25:53 2005
+++ 1.65/sql/sql_analyse.cc	Mon Oct 31 17:51:17 2005
@@ -1045,7 +1045,7 @@
 
   std_val= (dbl_sqr_sum - dbl_sum * dbl_sum / dbl_rows) / dbl_rows;
   s->set(((double) std_val <= 0.0 ? 0.0 : sqrt(std_val)),
-         item->decimals,my_thd_charset);
+         min(item->decimals + 1, NOT_FIXED_DEC), my_thd_charset);
 
   return s;
 }

--- 1.24/mysql-test/r/analyse.result	Mon Oct 31 16:25:53 2005
+++ 1.25/mysql-test/r/analyse.result	Mon Oct 31 17:51:17 2005
@@ -107,7 +107,7 @@
 insert into t1 values(2.2);
 select * from t1 procedure analyse();
 Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype
-test.t1.df	1.1	2.2	8	8	0	0	1.650000000	0.6	ENUM('1.1','2.2') NOT NULL
+test.t1.df	1.1	2.2	8	8	0	0	1.650000000	0.55	ENUM('1.1','2.2') NOT NULL
 drop table t1;
 create table t1 (d double);
 insert into t1 values (100000);
@@ -138,6 +138,6 @@
 select product, sum(profit),avg(profit) from t1 group by product with rollup procedure analyse();
 Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype
 test.t1.product	Computer	TV	2	8	0	0	4.2500	NULL	ENUM('Computer','Phone','TV') NOT NULL
-sum(profit)	10	6900	11	11	0	0	1946	2868	ENUM('10','275','600','6900') NOT NULL
-avg(profit)	10.000000000	1380.000000000	21	21	0	0	394.687500000	570.2003	ENUM('10.0000','68.7500','120.0000','1380.0000') NOT NULL
+sum(profit)	10	6900	11	11	0	0	1946	2867.7	ENUM('10','275','600','6900') NOT NULL
+avg(profit)	10.000000000	1380.000000000	21	21	0	0	394.687500000	570.20033	ENUM('10.0000','68.7500','120.0000','1380.0000') NOT NULL
 drop table t1,t2;