← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/single_thread/single_thread.h

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/single_thread/single_thread.h
36
36
    Scheduler(name_arg) {}
37
37
 
38
38
  /* When we enter this function, LOCK_thread_count is held! */
39
 
  virtual bool addSession(Session *session)
 
39
  virtual bool addSession(drizzled::Session *session)
40
40
  {
41
 
    if (my_thread_init())
 
41
    if (drizzled::internal::my_thread_init())
42
42
    {
43
 
      session->disconnect(ER_OUT_OF_RESOURCES, true);
44
 
      statistic_increment(aborted_connects, &LOCK_status);
 
43
      session->disconnect(drizzled::ER_OUT_OF_RESOURCES, true);
 
44
      statistic_increment(drizzled::aborted_connects, &LOCK_status);
45
45
      return true;
46
46
    }
47
47
 
56
56
    return false;
57
57
  }
58
58
 
59
 
  virtual void killSessionNow(Session *session)
 
59
  virtual void killSessionNow(drizzled::Session *session)
60
60
  {
61
 
    Session::unlink(session);
62
 
    my_thread_end();
 
61
    drizzled::Session::unlink(session);
 
62
    drizzled::internal::my_thread_end();
63
63
  }
64
64
};
65
65