From 3af2efc44d8e4eef1980b282b90b2fdaf50d669f Mon Sep 17 00:00:00 2001
From: Rich Prohaska <prohaska@tokutek.com>
Date: Wed, 17 Apr 2013 00:02:06 -0400
Subject: [PATCH] #4013 change lock timeout units from microseconds to
milliseconds refs[t:4013]
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@35553 c7de825b-a66e-492c-adef-691d508d4ae1
---
storage/tokudb/hatoku_hton.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc
index be4e64a4696..58eb06a71fb 100644
--- a/storage/tokudb/hatoku_hton.cc
+++ b/storage/tokudb/hatoku_hton.cc
@@ -422,7 +422,7 @@ static int tokudb_init_func(void *p) {
r = db_env->checkpointing_set_period(db_env, tokudb_checkpointing_period);
assert(!r);
- r = db_env->set_lock_timeout(db_env, tokudb_lock_timeout * 1000);
+ r = db_env->set_lock_timeout(db_env, tokudb_lock_timeout);
assert(r == 0);
r = db_create(&metadata_db, db_env, 0);
@@ -1544,10 +1544,10 @@ static void tokudb_lock_timeout_update(THD * thd,
ulonglong * timeout = (ulonglong *) var;
*timeout = *(const ulonglong *) save;
- db_env->set_lock_timeout(db_env, *timeout * 1000);
+ db_env->set_lock_timeout(db_env, *timeout);
}
-#define DEFAULT_LOCK_TIMEOUT_MSEC (4UL * 1000)
+#define DEFAULT_LOCK_TIMEOUT_MSEC 4000
static MYSQL_SYSVAR_ULONGLONG(lock_timeout, tokudb_lock_timeout,
0, "TokuDB lock timeout",
--
2.30.9