bk commit into 5.0 tree (mhansson:1.2491)

[mhansson]

Below is the list of changes that have just been committed into a local
5.0 repository of martin. When martin 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-03-22 10:58:16+01:00, mhansson@stripped +2 -0
  Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
  into  linux-st28.site:/home/martin/mysql/src/5.0o-bug24791
  MERGE: 1.2478.1.1

  sql/field.h@stripped, 2007-03-22 10:58:11+01:00, mhansson@stripped +0 -0
    Auto merged
    MERGE: 1.196.1.1

  sql/item_sum.cc@stripped, 2007-03-22 10:58:11+01:00, mhansson@stripped +0 -0
    Auto merged
    MERGE: 1.196.2.1

# 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:	mhansson
# Host:	linux-st28.site
# Root:	/home/martin/mysql/src/5.0o-bug24791/RESYNC

--- 1.197/sql/field.h	2007-03-13 13:58:47 +01:00
+++ 1.198/sql/field.h	2007-03-22 10:58:11 +01:00
@@ -432,6 +432,7 @@ public:
 
   int store_decimal(const my_decimal *);
   my_decimal *val_decimal(my_decimal *);
+  uint32 max_display_length() { return field_length; }
 };
 
 
@@ -461,7 +462,6 @@ public:
   void overflow(bool negative);
   bool zero_pack() const { return 0; }
   void sql_type(String &str) const;
-  uint32 max_display_length() { return field_length; }
 };
 
 
@@ -719,7 +719,6 @@ public:
   void sort_string(char *buff,uint length);
   uint32 pack_length() const { return sizeof(float); }
   void sql_type(String &str) const;
-  uint32 max_display_length() { return 24; }
 };
 
 
@@ -762,7 +761,6 @@ public:
   void sort_string(char *buff,uint length);
   uint32 pack_length() const { return sizeof(double); }
   void sql_type(String &str) const;
-  uint32 max_display_length() { return 53; }
   uint size_of() const { return sizeof(*this); }
 };
 

--- 1.198/sql/item_sum.cc	2007-03-20 20:20:15 +01:00
+++ 1.199/sql/item_sum.cc	2007-03-22 10:58:11 +01:00
@@ -1121,8 +1121,10 @@ void Item_sum_avg::fix_length_and_dec()
     f_scale=  args[0]->decimals;
     dec_bin_size= my_decimal_get_binary_size(f_precision, f_scale);
   }
-  else
+  else {
     decimals= min(args[0]->decimals + prec_increment, NOT_FIXED_DEC);
+    max_length= args[0]->max_length + prec_increment;
+  }
 }