← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Monty Taylor
  • Date: 2008-12-10 02:09:33 UTC
  • mto: (670.1.3 devel)
  • mto: This revision was merged to the branch mainline in revision 672.
  • Revision ID: monty@inaugust.com-20081210020933-nh3biepurtx2nc7j
Moved pthread keys

Show diffs side-by-side

added added

removed removed

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