Commit 9c2bb7b6 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/pem/work/mysql-4.1
parents 0432bec3 20dab90a

sql/field.h

+3 −0
Original line number Diff line number Diff line
@@ -352,6 +352,7 @@ class Field_str :public Field { 
  Item_result result_type () const { return STRING_RESULT; }

  uint decimals() const { return NOT_FIXED_DEC; }

  int  store(double nr);

  int  store(longlong nr)=0;

  int  store(const char *to,uint length,CHARSET_INFO *cs)=0;

  void make_field(Send_field *);

  uint size_of() const { return sizeof(*this); }
@@ -908,6 +909,7 @@ class Field_string :public Field_str { 
  void reset(void) { charset()->cset->fill(charset(),ptr,field_length,' '); }

  int  store(const char *to,uint length,CHARSET_INFO *charset);

  int  store(longlong nr);

  int store(double nr) { return Field_str::store(nr); }

  double val_real(void);

  longlong val_int(void);

  String *val_str(String*,String *);
@@ -953,6 +955,7 @@ class Field_varstring :public Field_str { 
  uint32 key_length() const { return (uint32) field_length; }

  int  store(const char *to,uint length,CHARSET_INFO *charset);

  int  store(longlong nr);

  int  store(double nr) { return Field_str::store(nr); }

  double val_real(void);

  longlong val_int(void);

  String *val_str(String*,String *);