Kouhei Sutou
null+****@clear*****
Tue Apr 22 10:22:16 JST 2014
Kouhei Sutou 2014-04-22 10:22:16 +0900 (Tue, 22 Apr 2014) New Revision: f0e2c51963596065f7a44ee8549abbee2f780826 https://github.com/mroonga/mroonga/commit/f0e2c51963596065f7a44ee8549abbee2f780826 Message: Set lock timeout as soon as possible It is better that it is done before we create any Groonga objects. Modified files: ha_mroonga.cpp Modified: ha_mroonga.cpp (+2 -1) =================================================================== --- ha_mroonga.cpp 2014-04-22 10:19:45 +0900 (c8ebb25) +++ ha_mroonga.cpp 2014-04-22 10:22:16 +0900 (934489e) @@ -1335,6 +1335,8 @@ static int mrn_init(void *p) goto err_grn_init; } + grn_set_lock_timeout(mrn_lock_timeout); + mrn_init_encoding_map(); grn_ctx_init(&mrn_ctx, 0); @@ -1396,7 +1398,6 @@ static int mrn_init(void *p) mrn_long_term_share_get_key, 0, 0)) { goto error_allocated_long_term_share_hash_init; } - grn_set_lock_timeout(mrn_lock_timeout); #ifdef MRN_USE_MYSQL_DATA_HOME mrn::PathMapper::default_mysql_data_home_path = mysql_data_home; -------------- next part -------------- HTML����������������������������...下载
