← 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: Brian Aker
  • Date: 2009-09-22 07:35:28 UTC
  • mfrom: (971.6.10 eday-dev)
  • Revision ID: brian@gaz-20090922073528-xgm634aomuflqxl3
Merge Eric

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pool_of_threads/pool_of_threads.cc
24
24
#include <drizzled/plugin/scheduler.h>
25
25
#include <drizzled/sql_parse.h>
26
26
#include <drizzled/session.h>
 
27
#include <drizzled/plugin/client.h>
27
28
#include "session_scheduler.h"
28
29
#include <string>
29
30
#include <queue>
483
484
  assert(scheduler);
484
485
  session->killed= Session::KILL_CONNECTION;    /* Avoid error messages */
485
486
 
486
 
  if (session->protocol->fileDescriptor() >= 0) /* not already closed */
 
487
  if (session->client->getFileDescriptor() >= 0) /* not already closed */
487
488
  {
488
489
    session->disconnect(0, true);
489
490
  }
507
508
 */
508
509
bool libevent_should_close_connection(Session* session)
509
510
{
510
 
  return session->protocol->haveError() ||
 
511
  return session->client->haveError() ||
511
512
         session->killed == Session::KILL_CONNECTION;
512
513
}
513
514
 
643
644
   indeed the root of the reason of low performace. Need to be changed
644
645
   when nonblocking Protocol is finished.
645
646
  */
646
 
  if (session->protocol->haveMoreData())
 
647
  if (session->client->haveMoreData())
647
648
    return true;
648
649
 
649
650
  scheduler->thread_detach();