← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pool_of_threads/pool_of_threads.cc

  • Committer: Eric Day
  • Date: 2009-08-06 07:14:37 UTC
  • mto: This revision was merged to the branch mainline in revision 1131.
  • Revision ID: eday@oddments.org-20090806071437-c3baqgtvsdxp1l1a
Renamed Protocol to Client, cleaned up some unnecessary methods along the way.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pool_of_threads/pool_of_threads.cc
19
19
#include <drizzled/plugin/scheduler.h>
20
20
#include <drizzled/sql_parse.h>
21
21
#include <drizzled/session.h>
 
22
#include <drizzled/plugin/client.h>
22
23
#include "session_scheduler.h"
23
24
#include <string>
24
25
#include <list>
417
418
  assert(scheduler);
418
419
  session->killed= Session::KILL_CONNECTION;          // Avoid error messages
419
420
 
420
 
  if (session->protocol->fileDescriptor() >= 0)      // not already closed
 
421
  if (session->client->getFileDescriptor() >= 0)      // not already closed
421
422
  {
422
423
    session->disconnect(0, true);
423
424
  }
438
439
 
439
440
bool libevent_should_close_connection(Session* session)
440
441
{
441
 
  return session->protocol->haveError() ||
 
442
  return session->client->haveError() ||
442
443
         session->killed == Session::KILL_CONNECTION;
443
444
}
444
445
 
567
568
    Note: we cannot add for event processing because the whole request might
568
569
    already be buffered and we wouldn't receive an event.
569
570
  */
570
 
  if (session->protocol->haveMoreData())
 
571
  if (session->client->haveMoreData())
571
572
    return true;
572
573
 
573
574
  scheduler->thread_detach();