bk commit into 5.0 tree (acurtis:1.2254)

[antony]

Below is the list of changes that have just been committed into a local
5.0 repository of antony. When antony 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, 2006-08-15 01:54:14-07:00, acurtis@stripped +2 -0
  fix windows build

  sql/field.cc@stripped, 2006-08-15 01:54:10-07:00, acurtis@stripped +1 -1
    fix windows build

  sql/field.h@stripped, 2006-08-15 01:54:10-07:00, acurtis@stripped +1 -1
    fix windows build

# 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:	acurtis
# Host:	ltantony.xiphis.org
# Root:	/home/antony/work2/merge-20060814/mysql-5.0-merge

--- 1.321/sql/field.cc	2006-08-15 01:54:24 -07:00
+++ 1.322/sql/field.cc	2006-08-15 01:54:24 -07:00
@@ -6412,7 +6412,7 @@
 }
 
 
-uint Field_varstring::data_length(const char *from)
+uint32 Field_varstring::data_length(const char *from)
 {
   return length_bytes == 1 ? (uint) (uchar) *ptr : uint2korr(ptr);
 }

--- 1.187/sql/field.h	2006-08-15 01:54:24 -07:00
+++ 1.188/sql/field.h	2006-08-15 01:54:24 -07:00
@@ -1107,7 +1107,7 @@
   int key_cmp(const byte *str, uint length);
   uint packed_col_length(const char *to, uint length);
   uint max_packed_col_length(uint max_length);
-  uint data_length(const char *from);
+  uint32 data_length(const char *from);
   uint size_of() const { return sizeof(*this); }
   enum_field_types real_type() const { return MYSQL_TYPE_VARCHAR; }
   bool has_charset(void) const