Commit 4c3b3eae authored by unknown's avatar unknown
Browse files

Merge error 


sql/field.h:
  Remove multiple definition of "cmp_binary_offset"
parent 6bdf9d27

sql/field.h

+0 −2
Original line number Diff line number Diff line
@@ -1364,8 +1364,6 @@ 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); }