← 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: Monty Taylor
  • Date: 2010-12-27 19:41:48 UTC
  • mfrom: (2035 staging)
  • mto: This revision was merged to the branch mainline in revision 2038.
  • Revision ID: mordred@inaugust.com-20101227194148-nqd86au4o76pdltw
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/multi_thread/multi_thread.cc
55
55
 
56
56
  if (drizzled::internal::my_thread_init())
57
57
  {
58
 
    session->disconnect(drizzled::ER_OUT_OF_RESOURCES, true);
 
58
    session->disconnect(drizzled::ER_OUT_OF_RESOURCES);
59
59
    session->status_var.aborted_connects++;
60
 
    killSessionNow(session);
61
 
  }
62
 
  boost::this_thread::at_thread_exit(&internal::my_thread_end);
63
 
 
64
 
  session->thread_stack= (char*) &stack_dummy;
65
 
  session->run();
 
60
  }
 
61
  else
 
62
  {
 
63
    boost::this_thread::at_thread_exit(&internal::my_thread_end);
 
64
 
 
65
    session->thread_stack= (char*) &stack_dummy;
 
66
    session->run();
 
67
  }
 
68
 
66
69
  killSessionNow(session);
67
70
  // @todo remove hard spin by disconnection the session first from the
68
71
  // thread.