← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/fstring.h

  • Committer: Stewart Smith
  • Date: 2008-08-02 07:12:36 UTC
  • mfrom: (258 drizzle)
  • mto: This revision was merged to the branch mainline in revision 408.
  • Revision ID: stewart@flamingspork.com-20080802071236-kbcozl5zm23j6mkn
merge from mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/fstring.h
21
21
#ifndef DRIZZLE_SERVER_FIELD_STRING
22
22
#define DRIZZLE_SERVER_FIELD_STRING
23
23
 
24
 
#include "mysql_priv.h"
 
24
#include <drizzled/mysql_priv.h>
25
25
 
26
26
class Field_string :public Field_longstr {
27
27
public:
41
41
 
42
42
  enum_field_types type() const
43
43
  {
44
 
    return  MYSQL_TYPE_STRING;
 
44
    return  DRIZZLE_TYPE_VARCHAR;
45
45
  }
46
46
  enum ha_base_keytype key_type() const
47
47
    { return binary() ? HA_KEYTYPE_BINARY : HA_KEYTYPE_TEXT; }
75
75
  uint packed_col_length(const uchar *to, uint length);
76
76
  uint max_packed_col_length(uint max_length);
77
77
  uint size_of() const { return sizeof(*this); }
78
 
  enum_field_types real_type() const { return MYSQL_TYPE_STRING; }
 
78
  enum_field_types real_type() const { return DRIZZLE_TYPE_VARCHAR; }
79
79
  bool has_charset(void) const
80
80
  { return charset() == &my_charset_bin ? false : true; }
81
81
  Field *new_field(MEM_ROOT *root, struct st_table *new_table, bool keep_type);
84
84
  int do_save_field_metadata(uchar *first_byte);
85
85
};
86
86
 
87
 
#endif
 
87
#endif /* DRIZZLE_SERVER_FIELD_STRING */