← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/string.cc

  • Committer: Olaf van der Spek
  • Date: 2011-07-07 13:41:07 UTC
  • mto: This revision was merged to the branch mainline in revision 2385.
  • Revision ID: olafvdspek@gmail.com-20110707134107-6mi7pauiatxtf4oe
Rename strmake to strdup (standard name)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/string.cc
30
30
  String tmp, cstr, *ostr= val_str(&tmp);
31
31
  cstr.copy(ostr->ptr(), ostr->length(), tocs);
32
32
  Item_string* conv= new Item_string(cstr.ptr(), cstr.length(), cstr.charset(), collation.derivation);
33
 
  char* ptr= getSession().mem.strmake(cstr);
 
33
  char* ptr= getSession().mem.strdup(cstr);
34
34
 
35
35
  conv->str_value.set(ptr, cstr.length(), cstr.charset());
36
36
  /* Ensure that no one is going to change the result string */