Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into narttu.mysql.fi:/my/mysql-4.1


sql/field.h:
  Auto merged

sql/field.h

@@ -83,7 +83,8 @@ class Field
   virtual void reset_fields() {}
   virtual void set_default()
   {
-    my_ptrdiff_t offset = table->default_values - table->record[0];
+    my_ptrdiff_t offset = (my_ptrdiff_t) (table->default_values -
+					  table->record[0]);
     memcpy(ptr, ptr + offset, pack_length());
     if (null_ptr)
       *null_ptr= ((*null_ptr & (uchar) ~null_bit) |