Merge pull request #7 from yoku0825/fix_for_mroonga_lock_timeout_init…

…ialization mroonga_lock_timeout doesn't refrect when it's specified at mysqld starts up Patch by yoku0825. Thanks!!!
mroonga · Apr 22, 2014 · 3584750 · 3584750
2 parents 960fb30 + 354732e
commit 3584750
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
@@ -1396,6 +1396,7 @@ 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;