← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/srv/srv0srv.cc

  • Committer: Lee Bieber
  • Date: 2011-02-11 20:30:05 UTC
  • mfrom: (2157.1.3 build)
  • Revision ID: kalebral@gmail.com-20110211203005-757o1y2yf78dxzqr
Merge Stewart - 716848: drizzleimport displays wrong program_name
Merge Stewart - update README file
Merge Andrew and Joe - Exposes the InnoDB SYS_REPLICATION_LOG to data_dictionary so that it is fast and fixes many issues we have been having

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/srv/srv0srv.cc
488
488
#ifdef UNIV_PFS_MUTEX
489
489
/* Key to register kernel_mutex with performance schema */
490
490
UNIV_INTERN mysql_pfs_key_t     kernel_mutex_key;
 
491
/* Key to protect writing the commit_id to the sys header */
 
492
UNIV_INTERN mysql_pfs_key_t     commit_id_mutex_key;
491
493
/* Key to register srv_innodb_monitor_mutex with performance schema */
492
494
UNIV_INTERN mysql_pfs_key_t     srv_innodb_monitor_mutex_key;
493
495
/* Key to register srv_monitor_file_mutex with performance schema */
746
748
UNIV_INTERN byte        srv_pad1[64];
747
749
/* mutex protecting the server, trx structs, query threads, and lock table */
748
750
UNIV_INTERN mutex_t*    kernel_mutex_temp;
 
751
/* mutex protecting the sys header for writing the commit id */
 
752
UNIV_INTERN mutex_t*    commit_id_mutex_temp;
 
753
 
749
754
/* padding to prevent other memory update hotspots from residing on
750
755
the same memory cache line */
751
756
UNIV_INTERN byte        srv_pad2[64];
1023
1028
        kernel_mutex_temp = static_cast<ib_mutex_t *>(mem_alloc(sizeof(mutex_t)));
1024
1029
        mutex_create(kernel_mutex_key, &kernel_mutex, SYNC_KERNEL);
1025
1030
 
 
1031
        commit_id_mutex_temp = static_cast<ib_mutex_t *>(mem_alloc(sizeof(mutex_t)));
 
1032
        mutex_create(commit_id_mutex_key, &commit_id_mutex, SYNC_COMMIT_ID_LOCK);
 
1033
 
1026
1034
        mutex_create(srv_innodb_monitor_mutex_key,
1027
1035
                     &srv_innodb_monitor_mutex, SYNC_NO_ORDER_CHECK);
1028
1036
 
1111
1119
        mem_free(srv_mysql_table);
1112
1120
        srv_mysql_table = NULL;
1113
1121
 
 
1122
        mem_free(commit_id_mutex_temp);
 
1123
        commit_id_mutex_temp = NULL;
 
1124
 
1114
1125
        trx_i_s_cache_free(trx_i_s_cache);
1115
1126
}
1116
1127