Commit fedf6131 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 

into  mysql.com:/users/lthalmann/bk/mysql-5.0-bug13418


sql/field.h:
  Auto merged
parents 2efabfd1 f9804136

sql/field.h

+5 −2
Original line number Diff line number Diff line
@@ -166,8 +166,9 @@ class Field 
  virtual int cmp(const char *,const char *)=0;

  virtual int cmp_binary(const char *a,const char *b, uint32 max_length=~0L)

  { return memcmp(a,b,pack_length()); }

  int cmp_offset(uint row_offset) { return cmp(ptr,ptr+row_offset); }

  int cmp_binary_offset(uint row_offset)

  virtual int cmp_offset(uint row_offset)

  { return cmp(ptr,ptr+row_offset); }

  virtual int cmp_binary_offset(uint row_offset)

  { return cmp_binary(ptr, ptr+row_offset); };

  virtual int key_cmp(const byte *a,const byte *b)

  { return cmp((char*) a,(char*) b); }
@@ -1327,6 +1328,8 @@ class Field_bit :public Field { 
  { return cmp_binary((char *) a, (char *) b); }

  int key_cmp(const byte *str, uint length);

  int cmp_offset(uint row_offset);

  int cmp_binary_offset(uint row_offset)

  { return cmp_offset(row_offset); }

  void get_key_image(char *buff, uint length, imagetype type);

  void set_key_image(char *buff, uint length)

  { Field_bit::store(buff, length, &my_charset_bin); }