← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/varstring.h

  • Committer: Jay Pipes
  • Date: 2010-01-12 16:44:32 UTC
  • mfrom: (1263 build)
  • mto: This revision was merged to the branch mainline in revision 1270.
  • Revision ID: jpipes@serialcoder-20100112164432-jra09ki86hf2mmli
Merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/varstring.h
106
106
  enum_field_types real_type() const { return DRIZZLE_TYPE_VARCHAR; }
107
107
  bool has_charset(void) const
108
108
  { return charset() == &my_charset_bin ? false : true; }
109
 
  Field *new_field(MEM_ROOT *root, Table *new_table, bool keep_type);
110
 
  Field *new_key_field(MEM_ROOT *root, Table *new_table,
 
109
  Field *new_field(drizzled::memory::Root *root, Table *new_table, bool keep_type);
 
110
  Field *new_key_field(drizzled::memory::Root *root, Table *new_table,
111
111
                       unsigned char *new_ptr, unsigned char *new_null_ptr,
112
112
                       uint32_t new_null_bit);
113
113
};