← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/multi_thread/multi_thread.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/multi_thread/multi_thread.cc
13
13
   along with this program; if not, write to the Free Software
14
14
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
15
15
 
16
 
#include <drizzled/server_includes.h>
 
16
#include "config.h"
17
17
#include <plugin/multi_thread/multi_thread.h>
 
18
#include "drizzled/pthread_globals.h"
18
19
 
19
20
using namespace std;
20
21
using namespace drizzled;
66
67
void MultiThreadScheduler::killSessionNow(Session *session)
67
68
{
68
69
  /* Locks LOCK_thread_count and deletes session */
69
 
  unlink_session(session);
 
70
  Session::unlink(session);
70
71
  thread_count--;
71
72
  my_thread_end();
72
73
  pthread_exit(0);
114
115
 
115
116
DRIZZLE_DECLARE_PLUGIN
116
117
{
 
118
  DRIZZLE_VERSION_ID,
117
119
  "multi_thread",
118
120
  "0.1",
119
121
  "Brian Aker",