~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
459
459
  mysys_var=0;                                  // Safety (shouldn't be needed)
460
460
 
461
461
  impl_->mem_root.free_root(MYF(0));
462
 
  currentMemRoot().release();
463
 
  currentSession().release();
 
462
  setCurrentMemRoot(NULL);
 
463
  setCurrentSession(NULL);
464
464
 
465
465
  plugin::Logging::postEndDo(this);
466
466
  plugin::EventObserver::deregisterSessionEvents(session_event_observers); 
531
531
    to track stack overrun.
532
532
  */
533
533
  assert(thread_stack);
534
 
  currentSession().reset(this);
535
 
  currentMemRoot().reset(&mem_root);
 
534
  setCurrentSession(this);
 
535
  setCurrentMemRoot(&mem);
536
536
 
537
537
  mysys_var= my_thread_var;
538
538