Kouhei Sutou
null+****@clear*****
Sat Oct 25 19:04:22 JST 2014
Kouhei Sutou 2014-10-25 19:04:22 +0900 (Sat, 25 Oct 2014) New Revision: f7151b602d2bbd1828bd71fd8319172300938485 https://github.com/mroonga/mroonga/commit/f7151b602d2bbd1828bd71fd8319172300938485 Message: Fix variable declaration block Modified files: ha_mroonga.cpp Modified: ha_mroonga.cpp (+3 -3) =================================================================== --- ha_mroonga.cpp 2014-10-25 19:03:07 +0900 (eac34de) +++ ha_mroonga.cpp 2014-10-25 19:04:22 +0900 (bba55f2) @@ -199,8 +199,6 @@ int grn_atoi(const char *nptr, const char *end, const char **rest); uint grn_atoui(const char *nptr, const char *end, const char **rest); /* global variables */ -static mysql_mutex_t mrn_log_mutex; -static PSI_mutex_key mrn_log_mutex_key; handlerton *mrn_hton_ptr; HASH mrn_open_tables; mysql_mutex_t mrn_open_tables_mutex; @@ -218,6 +216,8 @@ PSI_mutex_key mrn_long_term_share_auto_inc_mutex_key; /* internal variables */ static grn_ctx mrn_ctx; +static mysql_mutex_t mrn_log_mutex; +static PSI_mutex_key mrn_log_mutex_key; static grn_obj *mrn_db; static grn_ctx mrn_db_manager_ctx; static mysql_mutex_t mrn_db_manager_mutex; @@ -226,13 +226,13 @@ mrn::DatabaseManager *mrn_db_manager = NULL; static PSI_mutex_info mrn_mutexes[] = { - {&mrn_log_mutex_key, "log", PSI_FLAG_GLOBAL}, {&mrn_open_tables_mutex_key, "open_tables", PSI_FLAG_GLOBAL}, {&mrn_long_term_share_mutex_key, "long_term_share", PSI_FLAG_GLOBAL}, {&mrn_allocated_thds_mutex_key, "allocated_thds", PSI_FLAG_GLOBAL}, {&mrn_share_mutex_key, "share", 0}, {&mrn_long_term_share_auto_inc_mutex_key, "long_term_share::auto_inc", 0}, + {&mrn_log_mutex_key, "log", PSI_FLAG_GLOBAL}, {&mrn_db_manager_mutex_key, "DatabaseManager", PSI_FLAG_GLOBAL} }; -------------- next part -------------- HTML����������������������������...다운로드
