Merge magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt

into  magare.gmz:/home/kgeorge/mysql/work/B30825-5.1-opt

1 files changed, 0 insertions, 1 deletions

diff --git a/sql/field.h b/sql/field.h
index 8aad6783291..d0d867d0b32 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1522,7 +1522,6 @@ public:
   int  store(double nr);
   int  store(longlong nr, bool unsigned_val);
   int  store_decimal(const my_decimal *);
-  uint get_key_image(uchar *buff,uint length,imagetype type);
   uint size_of() const { return sizeof(*this); }
   int  reset(void) { return !maybe_null() || Field_blob::reset(); }
   geometry_type get_geometry_type() { return geom_type; };