Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint

sql/field.h

@@ -544,6 +544,7 @@ public:
   my_decimal *val_decimal(my_decimal *);
   int truncate(double *nr, double max_length);
   uint32 max_display_length() { return field_length; }
+  uint size_of() const { return sizeof(*this); }
 };
 
 
@@ -859,7 +860,6 @@ public:
   void sort_string(char *buff,uint length);
   uint32 pack_length() const { return sizeof(double); }
   void sql_type(String &str) const;
-  uint size_of() const { return sizeof(*this); }
 };