← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/multi_thread/multi_thread.cc

  • Committer: Lee Bieber
  • Date: 2011-04-14 16:20:43 UTC
  • mfrom: (2277.1.3 build)
  • Revision ID: kalebral@gmail.com-20110414162043-2khq8mql7gvodnzn
Merge Olaf - Refactor Session Cache and Remove table::Cache::singleton()
Merge Olaf - Refactor Thread
Merge Olaf - remove unused functions

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/multi_thread/multi_thread.cc
167
167
 
168
168
void MultiThreadScheduler::killSession(Session *session)
169
169
{
170
 
  boost_thread_shared_ptr thread(session->getThread());
 
170
  thread_ptr thread(session->getThread());
171
171
 
172
172
  if (thread)
173
173
  {
188
188
 
189
189
MultiThreadScheduler::~MultiThreadScheduler()
190
190
{
191
 
  boost::mutex::scoped_lock scopedLock(drizzled::session::Cache::singleton().mutex());
 
191
  boost::mutex::scoped_lock scopedLock(drizzled::session::Cache::mutex());
192
192
  while (thread_count)
193
193
  {
194
194
    COND_thread_count.wait(scopedLock);