bk commit into 5.1 tree (kaa:1.2514)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.1 repository of kaa. When kaa 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-29 16:38:43+04:00, kaa@stripped +1 -0
  Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint
  into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
  MERGE: 1.1810.2938.27

  sql/field.h@stripped, 2007-05-29 16:38:38+04:00, kaa@stripped +0 -1
    Auto merged
    MERGE: 1.153.27.3

# 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:	kaa
# Host:	polly.local
# Root:	/home/kaa/src/maint/mysql-5.1-maint/RESYNC

--- 1.228/sql/field.h	2007-05-28 15:36:12 +04:00
+++ 1.229/sql/field.h	2007-05-29 16:38:38 +04:00
@@ -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); }
 };