bk commit into 4.1 tree (hf:1.2458) BUG#13372

[holyfoot]

Below is the list of changes that have just been committed into a local
4.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.2458 05/09/27 15:31:38 hf@deer.(none) +2 -0
  additional fix to the bug #13372 (decimal union)

  sql/item.cc
    1.223 05/09/27 15:31:35 hf@deer.(none) +2 -2
    we have to limit the max_length

  mysql-test/r/type_float.result
    1.34 05/09/27 15:31:35 hf@deer.(none) +1 -1
    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-4.1.13372

--- 1.222/sql/item.cc	Tue Sep 27 15:10:42 2005
+++ 1.223/sql/item.cc	Tue Sep 27 15:31:35 2005
@@ -3230,12 +3230,12 @@
   }
   case REAL_RESULT:
   {
-    decimals= max(decimals, item->decimals);
     if (decimals != NOT_FIXED_DEC)
     {
       int delta1= max_length_orig - decimals_orig;
       int delta2= item->max_length - item->decimals;
-      max_length= max(delta1, delta2) + decimals;
+      max_length= min(max(delta1, delta2) + decimals,
+                      (fld_type == MYSQL_TYPE_FLOAT) ? FLT_DIG+6 : DBL_DIG+7);
     }
     else
       max_length= (fld_type == MYSQL_TYPE_FLOAT) ? FLT_DIG+6 : DBL_DIG+7;

--- 1.33/mysql-test/r/type_float.result	Tue Sep 27 15:10:42 2005
+++ 1.34/mysql-test/r/type_float.result	Tue Sep 27 15:31:35 2005
@@ -247,6 +247,6 @@
 show create table t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
-  `d` double(61,9) default NULL
+  `d` double(22,9) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2, t3;