Commit bf963106 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Fix warnings

parent 2662228d
...@@ -318,7 +318,7 @@ dict_stats_save_defrag_stats(dict_index_t* index, trx_t* trx) ...@@ -318,7 +318,7 @@ dict_stats_save_defrag_stats(dict_index_t* index, trx_t* trx)
return DB_SUCCESS; return DB_SUCCESS;
} }
lint now = ut_time(); ib_time_t now = ut_time();
dberr_t err = dict_stats_save_index_stat( dberr_t err = dict_stats_save_index_stat(
index, now, "n_page_split", index, now, "n_page_split",
index->stat_defrag_n_page_split, index->stat_defrag_n_page_split,
......
...@@ -2256,7 +2256,7 @@ storage. ...@@ -2256,7 +2256,7 @@ storage.
dberr_t dberr_t
dict_stats_save_index_stat( dict_stats_save_index_stat(
dict_index_t* index, dict_index_t* index,
lint last_update, ib_time_t last_update,
const char* stat_name, const char* stat_name,
ib_uint64_t stat_value, ib_uint64_t stat_value,
ib_uint64_t* sample_size, ib_uint64_t* sample_size,
...@@ -2278,7 +2278,7 @@ dict_stats_save_index_stat( ...@@ -2278,7 +2278,7 @@ dict_stats_save_index_stat(
pars_info_add_str_literal(pinfo, "table_name", table_utf8); pars_info_add_str_literal(pinfo, "table_name", table_utf8);
pars_info_add_str_literal(pinfo, "index_name", index->name); pars_info_add_str_literal(pinfo, "index_name", index->name);
UNIV_MEM_ASSERT_RW_ABORT(&last_update, 4); UNIV_MEM_ASSERT_RW_ABORT(&last_update, 4);
pars_info_add_int4_literal(pinfo, "last_update", last_update); pars_info_add_int4_literal(pinfo, "last_update", (lint)last_update);
UNIV_MEM_ASSERT_RW_ABORT(stat_name, strlen(stat_name)); UNIV_MEM_ASSERT_RW_ABORT(stat_name, strlen(stat_name));
pars_info_add_str_literal(pinfo, "stat_name", stat_name); pars_info_add_str_literal(pinfo, "stat_name", stat_name);
UNIV_MEM_ASSERT_RW_ABORT(&stat_value, 8); UNIV_MEM_ASSERT_RW_ABORT(&stat_value, 8);
...@@ -2389,7 +2389,7 @@ dict_stats_save( ...@@ -2389,7 +2389,7 @@ dict_stats_save(
const index_id_t* only_for_index = NULL) const index_id_t* only_for_index = NULL)
{ {
pars_info_t* pinfo; pars_info_t* pinfo;
lint now; ib_time_t now;
dberr_t ret; dberr_t ret;
dict_table_t* table; dict_table_t* table;
char db_utf8[MAX_DB_UTF8_LEN]; char db_utf8[MAX_DB_UTF8_LEN];
...@@ -2407,16 +2407,14 @@ dict_stats_save( ...@@ -2407,16 +2407,14 @@ dict_stats_save(
dict_fs2utf8(table->name.m_name, db_utf8, sizeof(db_utf8), dict_fs2utf8(table->name.m_name, db_utf8, sizeof(db_utf8),
table_utf8, sizeof(table_utf8)); table_utf8, sizeof(table_utf8));
/* MySQL's timestamp is 4 byte, so we use
pars_info_add_int4_literal() which takes a lint arg, so "now" is now = ut_time();
lint */
now = (lint) ut_time();
pinfo = pars_info_create(); pinfo = pars_info_create();
pars_info_add_str_literal(pinfo, "database_name", db_utf8); pars_info_add_str_literal(pinfo, "database_name", db_utf8);
pars_info_add_str_literal(pinfo, "table_name", table_utf8); pars_info_add_str_literal(pinfo, "table_name", table_utf8);
pars_info_add_int4_literal(pinfo, "last_update", now); pars_info_add_int4_literal(pinfo, "last_update", (lint)now);
pars_info_add_ull_literal(pinfo, "n_rows", table->stat_n_rows); pars_info_add_ull_literal(pinfo, "n_rows", table->stat_n_rows);
pars_info_add_ull_literal(pinfo, "clustered_index_size", pars_info_add_ull_literal(pinfo, "clustered_index_size",
table->stat_clustered_index_size); table->stat_clustered_index_size);
......
...@@ -212,7 +212,7 @@ storage. ...@@ -212,7 +212,7 @@ storage.
dberr_t dberr_t
dict_stats_save_index_stat( dict_stats_save_index_stat(
dict_index_t* index, dict_index_t* index,
lint last_update, ib_time_t last_update,
const char* stat_name, const char* stat_name,
ib_uint64_t stat_value, ib_uint64_t stat_value,
ib_uint64_t* sample_size, ib_uint64_t* sample_size,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment