← Back to branch summary

~dshrews/drizzle/bug643935

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Brian Aker
  • Date: 2010-09-20 00:00:20 UTC
  • Revision ID: brian@tangent.org-20100920000020-s6x30brpajr83pkr
Update session/memory to use boost specific.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
324
324
 
325
325
/* Thread specific variables */
326
326
 
327
 
pthread_key_t THR_Mem_root;
328
 
pthread_key_t THR_Session;
329
327
boost::mutex LOCK_open;
330
328
boost::mutex LOCK_global_system_variables;
331
329
boost::mutex LOCK_thread_count;
1053
1051
  max_system_variables.pseudo_thread_id= UINT32_MAX;
1054
1052
  server_start_time= flush_status_time= curr_time;
1055
1053
 
1056
 
  if (init_thread_environment())
1057
 
    return 1;
1058
1054
  drizzle_init_variables();
1059
1055
 
1060
1056
  {
1360
1356
}
1361
1357
 
1362
1358
 
1363
 
int init_thread_environment()
1364
 
{
1365
 
  if (pthread_key_create(&THR_Session,NULL) ||
1366
 
      pthread_key_create(&THR_Mem_root,NULL))
1367
 
  {
1368
 
      errmsg_printf(ERRMSG_LVL_ERROR, _("Can't create thread-keys"));
1369
 
    return 1;
1370
 
  }
1371
 
  return 0;
1372
 
}
1373
 
 
1374
1359
int init_server_components(module::Registry &plugins)
1375
1360
{
1376
1361
  /*