← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sys_var.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-21 14:08:41 UTC
  • mto: This revision was merged to the branch mainline in revision 2346.
  • Revision ID: olafvdspek@gmail.com-20110621140841-b6gc81018n00819r
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sys_var.cc
963
963
    if (str)
964
964
    {
965
965
      uint32_t length= strlen(str);
966
 
      tmp= new Item_string(session->mem.strmake_root(str, length), length, system_charset_info, DERIVATION_SYSCONST);
 
966
      tmp= new Item_string(session->mem.strmake(str, length), length, system_charset_info, DERIVATION_SYSCONST);
967
967
    }
968
968
    else
969
969
    {
1596
1596
  if (type == OPT_GLOBAL)
1597
1597
    engine= global_system_variables.*offset;
1598
1598
  string engine_name= engine->getName();
1599
 
  return (unsigned char *) session->mem.strmake_root(engine_name.c_str(), engine_name.size());
 
1599
  return (unsigned char *) session->mem.strmake(engine_name.c_str(), engine_name.size());
1600
1600
}
1601
1601
 
1602
1602