[t:4018] close[t:4018] merging 4018 handlerton changes to main.

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@35664 c7de825b-a66e-492c-adef-691d508d4ae1

storage/tokudb/ha_tokudb.cc

@@ -5563,6 +5563,8 @@ int ha_tokudb::info(uint flag) {
                 );
             if (error) { goto cleanup; }
             
+            stats.create_time = dict_stats.bt_create_time_sec;
+            stats.update_time = dict_stats.bt_modify_time_sec;
             stats.data_file_length = dict_stats.bt_dsize;
             if (hidden_primary_key) {
                 //

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);
+    r = db_env->set_lock_timeout(db_env, tokudb_lock_timeout * 1000);
     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);
+    db_env->set_lock_timeout(db_env, *timeout * 1000);
 }
 
-#define DEFAULT_LOCK_TIMEOUT_MSEC 4000
+#define DEFAULT_LOCK_TIMEOUT_MSEC (4UL * 1000)
 
 static MYSQL_SYSVAR_ULONGLONG(lock_timeout, tokudb_lock_timeout,
         0, "TokuDB lock timeout",