Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint

into  mysql.com:/home/ram/work/b28631/b28631.5.1


sql/field.h:
  Auto merged

1 files changed, 1 insertions, 0 deletions

diff --git a/sql/field.h b/sql/field.h
index 9a357427eb5..566fc98395a 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1552,6 +1552,7 @@ public:
             bit_ptr == ((Field_bit *)field)->bit_ptr &&
             bit_ofs == ((Field_bit *)field)->bit_ofs);
   }
+  uint is_equal(create_field *new_field);
   void move_field_offset(my_ptrdiff_t ptr_diff)
   {
     Field::move_field_offset(ptr_diff);