← 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: 2010-12-29 18:44:32 UTC
  • mfrom: (2039.1.3 build)
  • Revision ID: kalebral@gmail.com-20101229184432-9hb2btniinjjlom4
Merge Andrew - fix bug 683620: Unhandled exception from boost::thread::start_thread
Merge Stewart - fix bug 695203: test-run --gdb no longer sets breakpoint        
Merge Lee - some minor copyright updates

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/multi_thread/multi_thread.cc
116
116
    return true;
117
117
 
118
118
  thread_count.increment();
119
 
 
120
 
  session->getThread().reset(new boost::thread((boost::bind(&MultiThreadScheduler::runSession, this, session->getSessionId()))));
 
119
  try
 
120
  {
 
121
    session->getThread().reset(new boost::thread((boost::bind(&MultiThreadScheduler::runSession, this, session->getSessionId()))));
 
122
  }
 
123
  catch (std::exception&)
 
124
  {
 
125
    thread_count.decrement();
 
126
    return true;
 
127
  }
121
128
 
122
129
  if (not session->getThread())
123
130
  {