← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Brian Aker
  • Date: 2008-12-11 08:52:18 UTC
  • mfrom: (670.1.11 devel)
  • Revision ID: brian@tangent.org-20081211085218-cpmznmzrflyd82j2
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
36
36
#include <drizzled/query_id.h>
37
37
#include <drizzled/data_home.h>
38
38
#include <drizzled/sql_base.h>
 
39
#include <drizzled/lock.h>
39
40
 
40
41
extern scheduler_functions thread_scheduler;
41
42
/*
46
47
char empty_c_string[1]= {0};    /* used for not defined db */
47
48
 
48
49
const char * const Session::DEFAULT_WHERE= "field list";
 
50
extern pthread_key_t THR_Session;
 
51
extern pthread_key_t THR_Mem_root;
49
52
 
50
53
 
51
54
/*****************************************************************************
64
67
template class List_iterator<Alter_column>;
65
68
#endif
66
69
 
 
70
 
67
71
/****************************************************************************
68
72
** User variables
69
73
****************************************************************************/
778
782
  }
779
783
 
780
784
  free_root(&main_mem_root, MYF(0));
 
785
  pthread_setspecific(THR_Session,  0);
781
786
  return;
782
787
}
783
788
 
894
899
  assert(thread_stack);
895
900
 
896
901
  if (pthread_setspecific(THR_Session,  this) ||
897
 
      pthread_setspecific(THR_MALLOC, &mem_root))
 
902
      pthread_setspecific(THR_Mem_root, &mem_root))
898
903
    return 1;
899
904
  mysys_var=my_thread_var;
900
905
  /*