← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/string.cc

  • Committer: Mark Atwood
  • Date: 2011-10-21 14:25:19 UTC
  • mfrom: (2440.2.28 rf)
  • Revision ID: me@mark.atwood.name-20111021142519-bqnyqrkthibv70rc
Tags: 2011.10.28
merge lp:~olafvdspek/drizzle/refactor6

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/string.cc
43
43
{
44
44
  String tmp, cstr, *ostr= val_str(&tmp);
45
45
  cstr.copy(ostr->ptr(), ostr->length(), tocs);
46
 
  Item_string* conv= new Item_static_string_func(func_name, cstr.ptr(), cstr.length(), cstr.charset(), collation.derivation);
 
46
  Item_string* conv= new Item_static_string_func(func_name, cstr, cstr.charset(), collation.derivation);
47
47
  conv->str_value.copy();
48
48
  /* Ensure that no one is going to change the result string */
49
49
  conv->str_value.mark_as_const();