Merge error

7c523830 · msvensson@shellback.(none) · 03d436d3 · 7c523830
Commit 7c523830 authored Mar 01, 2006 by msvensson@shellback.(none)
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

sql/field.h sql/field.h +0 -2

No files found.
--- a/sql/field.h
+++ b/sql/field.h
@@ -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); }