← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sys_var.cc

  • Committer: Mark Atwood
  • Date: 2011-08-04 16:21:21 UTC
  • mfrom: (2318.9.14 refactor3)
  • Revision ID: me@mark.atwood.name-20110804162121-6b9ay1b1de3yfgvl
merge lp:~olafvdspek/drizzle/refactor3

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sys_var.cc
961
961
    if (str)
962
962
    {
963
963
      uint32_t length= strlen(str);
964
 
      tmp= new Item_string(session->mem.strmake(str, length), length, system_charset_info, DERIVATION_SYSCONST);
 
964
      tmp= new Item_string(session->mem.strdup(str, length), length, system_charset_info, DERIVATION_SYSCONST);
965
965
    }
966
966
    else
967
967
    {
1575
1575
  if (type == OPT_GLOBAL)
1576
1576
    engine= global_system_variables.*offset;
1577
1577
  string engine_name= engine->getName();
1578
 
  return (unsigned char *) session->mem.strmake(engine_name);
 
1578
  return (unsigned char *) session->mem.strdup(engine_name);
1579
1579
}
1580
1580
 
1581
1581