← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/hex_string.cc

  • Committer: Mark Atwood
  • Date: 2011-06-27 19:01:37 UTC
  • mfrom: (2318.6.90 refactor16)
  • Revision ID: me@mark.atwood.name-20110627190137-iflt3vku0kw77l8a
merge lp:~olafvdspek/drizzle/refactor17

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/hex_string.cc
144
144
  Item_string *conv;
145
145
  String tmp, *str= val_str(&tmp);
146
146
 
147
 
  if (!(conv= new Item_string(str->ptr(), str->length(), tocs)))
148
 
    return NULL;
 
147
  conv= new Item_string(str->ptr(), str->length(), tocs);
149
148
  conv->str_value.copy();
150
149
  conv->str_value.mark_as_const();
151
150
  return conv;