← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/current_session.cc

  • Committer: Mark Atwood
  • Date: 2011-06-27 19:01:37 UTC
  • mfrom: (2318.6.90 refactor16)
  • Revision ID: me@mark.atwood.name-20110627190137-iflt3vku0kw77l8a
merge lp:~olafvdspek/drizzle/refactor17

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/current_session.cc
37
37
 
38
38
void setCurrentSession(Session* v)
39
39
{
40
 
  if (v)
41
 
    THR_Session.reset(v);
42
 
  else
43
 
    THR_Session.release();
 
40
  THR_Session.release();
 
41
  THR_Session.reset(v);
44
42
}
45
43
 
46
44
void setCurrentMemRoot(memory::Root* v)
47
45
{
48
 
  if (v)
49
 
    THR_Mem_root.reset(v);
50
 
  else
51
 
    THR_Mem_root.release();
 
46
  THR_Mem_root.release();
 
47
  THR_Mem_root.reset(v);
52
48
}
53
49
 
54
50
} /* namespace drizzled */