← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Brian Aker
  • Date: 2009-01-24 07:03:13 UTC
  • Revision ID: brian@gir-3.local-20090124070313-vdxbxhuebkyhdcy4
Remove dead locks related to replication.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
416
416
                LOCK_status,
417
417
                LOCK_global_read_lock,
418
418
                LOCK_global_system_variables,
419
 
                LOCK_slave_list,
420
 
                LOCK_active_mi,
421
419
                LOCK_connection_count;
422
420
 
423
421
pthread_rwlock_t        LOCK_sys_init_connect;
424
 
pthread_rwlock_t        LOCK_sys_init_slave;
425
422
pthread_rwlock_t        LOCK_system_variables_hash;
426
423
pthread_cond_t COND_refresh, COND_thread_count, COND_global_read_lock;
427
424
pthread_t signal_thread;
857
854
  (void) pthread_mutex_destroy(&LOCK_thread_count);
858
855
  (void) pthread_mutex_destroy(&LOCK_status);
859
856
  (void) pthread_mutex_destroy(&LOCK_connection_count);
860
 
  (void) pthread_mutex_destroy(&LOCK_active_mi);
861
857
  (void) pthread_rwlock_destroy(&LOCK_sys_init_connect);
862
 
  (void) pthread_rwlock_destroy(&LOCK_sys_init_slave);
863
858
  (void) pthread_mutex_destroy(&LOCK_global_system_variables);
864
859
  (void) pthread_rwlock_destroy(&LOCK_system_variables_hash);
865
860
  (void) pthread_mutex_destroy(&LOCK_global_read_lock);
2005
2000
  (void) pthread_mutex_init(&LOCK_open, NULL);
2006
2001
  (void) pthread_mutex_init(&LOCK_thread_count,MY_MUTEX_INIT_FAST);
2007
2002
  (void) pthread_mutex_init(&LOCK_status,MY_MUTEX_INIT_FAST);
2008
 
  (void) pthread_mutex_init(&LOCK_active_mi, MY_MUTEX_INIT_FAST);
2009
2003
  (void) pthread_mutex_init(&LOCK_global_system_variables, MY_MUTEX_INIT_FAST);
2010
2004
  (void) pthread_rwlock_init(&LOCK_system_variables_hash, NULL);
2011
2005
  (void) pthread_mutex_init(&LOCK_global_read_lock, MY_MUTEX_INIT_FAST);
2012
2006
  (void) pthread_mutex_init(&LOCK_connection_count, MY_MUTEX_INIT_FAST);
2013
2007
  (void) pthread_rwlock_init(&LOCK_sys_init_connect, NULL);
2014
 
  (void) pthread_rwlock_init(&LOCK_sys_init_slave, NULL);
2015
2008
  (void) pthread_cond_init(&COND_thread_count,NULL);
2016
2009
  (void) pthread_cond_init(&COND_refresh,NULL);
2017
2010
  (void) pthread_cond_init(&COND_global_read_lock,NULL);