Set lock timeout as soon as possible

It is better that it is done before we create any Groonga objects.
mroonga · Apr 22, 2014 · f0e2c51 · f0e2c51
1 parent 3584750
commit f0e2c51
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
@@ -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;