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

Merge 


sql/field.h:
  SCCS merged
parents 7b36ac48 c5745288

sql/field.h

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ class Field 
  virtual Field *new_key_field(MEM_ROOT *root, struct st_table *new_table,

                               char *new_ptr, uchar *new_null_ptr,

                               uint new_null_bit);

  virtual void move_field(char *ptr_arg,uchar *null_ptr_arg,uchar null_bit_arg)

  inline void move_field(char *ptr_arg,uchar *null_ptr_arg,uchar null_bit_arg)

  {

    ptr=ptr_arg; null_ptr=null_ptr_arg; null_bit=null_bit_arg;

  }