← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/user_var_entry.h

  • Committer: Mark Atwood
  • Date: 2011-10-08 04:50:51 UTC
  • mfrom: (2430.1.1 rf)
  • Revision ID: me@mark.atwood.name-20111008045051-6ha1qiy7k2a9c3jv
Tags: 2011.10.27
merge lp:~olafvdspek/drizzle/refactor2

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/user_var_entry.h
38
38
    unsigned_flag(false),
39
39
    collation(NULL, DERIVATION_IMPLICIT)
40
40
  { 
41
 
    name.str= strdup(arg);
42
 
    name.length= strlen(arg);
 
41
    name.assign(strdup(arg), strlen(arg));
43
42
  }
44
43
 
45
44
  ~user_var_entry()
46
45
  {
47
 
    free(const_cast<char*>(name.str));
 
46
    free(const_cast<char*>(name.data()));
48
47
    free(value);
49
48
  }
50
49