bk commit into 5.1 tree (holyfoot:1.2520)

[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@stripped, 2007-05-11 20:58:25+05:00, holyfoot@hfmain.(none) +4 -0
  Merge mysql.com:/home/hf/work/27957/my50-27957
  into  mysql.com:/home/hf/work/27957/my51-27957
  MERGE: 1.1810.2868.44

  mysql-test/r/type_datetime.result@stripped, 2007-05-11 20:57:30+05:00,
holyfoot@hfmain.(none) +0 -2
    merging
    MERGE: 1.30.1.12

  mysql-test/t/type_datetime.test@stripped, 2007-05-11 20:57:47+05:00, holyfoot@hfmain.(none)
+0 -1
    merging
    MERGE: 1.18.1.10

  sql/item_func.cc@stripped, 2007-05-11 20:56:48+05:00, holyfoot@hfmain.(none) +4 -6
    Auto merged
    MERGE: 1.270.1.71

  sql/my_decimal.h@stripped, 2007-05-11 20:58:20+05:00, holyfoot@hfmain.(none) +0 -1
    merging
    MERGE: 1.10.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:	holyfoot
# Host:	hfmain.(none)
# Root:	/home/hf/work/27957/my51-27957/RESYNC

--- 1.389/sql/item_func.cc	2007-05-11 20:58:31 +05:00
+++ 1.390/sql/item_func.cc	2007-05-11 20:58:31 +05:00
@@ -1049,6 +1049,8 @@ my_decimal *Item_decimal_typecast::val_d
 {
   my_decimal tmp_buf, *tmp= args[0]->val_decimal(&tmp_buf);
   bool sign;
+  uint precision;
+
   if ((null_value= args[0]->null_value))
     return NULL;
   my_decimal_round(E_DEC_FATAL_ERROR, tmp, decimals, FALSE, dec);
@@ -1061,9 +1063,11 @@ my_decimal *Item_decimal_typecast::val_d
       goto err;
     }
   }
-  if (max_length - 2 - decimals < (uint) my_decimal_intg(dec))
+  precision= my_decimal_length_to_precision(max_length,
+                                            decimals, unsigned_flag);
+  if (precision - decimals < (uint) my_decimal_intg(dec))
   {
-    max_my_decimal(dec, max_length - 2, decimals);
+    max_my_decimal(dec, precision, decimals);
     dec->sign(sign);
     goto err;
   }
@@ -1082,7 +1086,6 @@ void Item_decimal_typecast::print(String
 {
   char len_buf[20*3 + 1];
   char *end;
-  CHARSET_INFO *cs= str->charset();
 
   uint precision= my_decimal_length_to_precision(max_length, decimals,
                                                  unsigned_flag);