← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/string.h

  • Committer: Brian Aker
  • Date: 2010-12-27 19:18:58 UTC
  • mfrom: (2035 staging)
  • mto: (2035.1.1 clean)
  • mto: This revision was merged to the branch mainline in revision 2037.
  • Revision ID: brian@tangent.org-20101227191858-h11rg8ncrkiklg3f
Manage merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/string.h
77
77
    assert(fixed == 1);
78
78
    return (String*) &str_value;
79
79
  }
80
 
  my_decimal *val_decimal(my_decimal *);
 
80
  type::Decimal *val_decimal(type::Decimal *);
81
81
  int save_in_field(Field *field, bool no_conversions);
82
82
  enum Item_result result_type () const { return STRING_RESULT; }
83
83
  enum_field_types field_type() const { return DRIZZLE_TYPE_VARCHAR; }