diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-12-08 13:10:41 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-12-08 13:10:41 +0000 |
| commit | bf96310657116bccc3ef0be66084db5a446d4ba4 (patch) | |
| tree | 7b65e4950ea6ef162c4b1d1570c77ddbabbe1612 | |
| parent | 2662228d1836c8af36b915b1658924b272033150 (diff) | |
| download | mariadb-git-bf96310657116bccc3ef0be66084db5a446d4ba4.tar.gz | |
Fix warnings
| -rw-r--r-- | storage/innobase/dict/dict0defrag_bg.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/dict/dict0stats.cc | 14 | ||||
| -rw-r--r-- | storage/innobase/include/dict0stats.h | 2 |
3 files changed, 8 insertions, 10 deletions
diff --git a/storage/innobase/dict/dict0defrag_bg.cc b/storage/innobase/dict/dict0defrag_bg.cc index 8f2c3231e1c..e43a75b2cf7 100644 --- a/storage/innobase/dict/dict0defrag_bg.cc +++ b/storage/innobase/dict/dict0defrag_bg.cc @@ -318,7 +318,7 @@ dict_stats_save_defrag_stats(dict_index_t* index, trx_t* trx) return DB_SUCCESS; } - lint now = ut_time(); + ib_time_t now = ut_time(); dberr_t err = dict_stats_save_index_stat( index, now, "n_page_split", index->stat_defrag_n_page_split, diff --git a/storage/innobase/dict/dict0stats.cc b/storage/innobase/dict/dict0stats.cc index 9afa228661d..e4aca96da4b 100644 --- a/storage/innobase/dict/dict0stats.cc +++ b/storage/innobase/dict/dict0stats.cc @@ -2256,7 +2256,7 @@ storage. dberr_t dict_stats_save_index_stat( dict_index_t* index, - lint last_update, + ib_time_t last_update, const char* stat_name, ib_uint64_t stat_value, ib_uint64_t* sample_size, @@ -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, "index_name", index->name); 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)); pars_info_add_str_literal(pinfo, "stat_name", stat_name); UNIV_MEM_ASSERT_RW_ABORT(&stat_value, 8); @@ -2389,7 +2389,7 @@ dict_stats_save( const index_id_t* only_for_index = NULL) { pars_info_t* pinfo; - lint now; + ib_time_t now; dberr_t ret; dict_table_t* table; char db_utf8[MAX_DB_UTF8_LEN]; @@ -2407,16 +2407,14 @@ dict_stats_save( dict_fs2utf8(table->name.m_name, db_utf8, sizeof(db_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 - lint */ - now = (lint) ut_time(); + + now = ut_time(); pinfo = pars_info_create(); pars_info_add_str_literal(pinfo, "database_name", db_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, "clustered_index_size", table->stat_clustered_index_size); diff --git a/storage/innobase/include/dict0stats.h b/storage/innobase/include/dict0stats.h index 4a34b90195a..357d26b5557 100644 --- a/storage/innobase/include/dict0stats.h +++ b/storage/innobase/include/dict0stats.h @@ -212,7 +212,7 @@ storage. dberr_t dict_stats_save_index_stat( dict_index_t* index, - lint last_update, + ib_time_t last_update, const char* stat_name, ib_uint64_t stat_value, ib_uint64_t* sample_size, |