mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 05:52:27 +01:00
merging with fix for compiler warnings.
This commit is contained in:
commit
a4fba5727a
4 changed files with 8 additions and 8 deletions
|
@ -1474,8 +1474,8 @@ int ha_archive::info(uint flag)
|
|||
|
||||
stats.mean_rec_length= table->s->reclength + buffer.alloced_length();
|
||||
stats.data_file_length= file_stat.st_size;
|
||||
stats.create_time= file_stat.st_ctime;
|
||||
stats.update_time= file_stat.st_mtime;
|
||||
stats.create_time= (ulong) file_stat.st_ctime;
|
||||
stats.update_time= (ulong) file_stat.st_mtime;
|
||||
stats.max_data_file_length= share->rows_recorded * stats.mean_rec_length;
|
||||
}
|
||||
stats.delete_length= 0;
|
||||
|
|
|
@ -2850,10 +2850,10 @@ int ha_federated::info(uint flag)
|
|||
stats.data_file_length= stats.records * stats.mean_rec_length;
|
||||
|
||||
if (row[12] != NULL)
|
||||
stats.update_time= (time_t) my_strtoll10(row[12], (char**) 0,
|
||||
stats.update_time= (ulong) my_strtoll10(row[12], (char**) 0,
|
||||
&error);
|
||||
if (row[13] != NULL)
|
||||
stats.check_time= (time_t) my_strtoll10(row[13], (char**) 0,
|
||||
stats.check_time= (ulong) my_strtoll10(row[13], (char**) 0,
|
||||
&error);
|
||||
}
|
||||
/*
|
||||
|
|
|
@ -6012,7 +6012,7 @@ ha_innobase::info(
|
|||
nor the CHECK TABLE time, nor the UPDATE or INSERT time. */
|
||||
|
||||
if (os_file_get_status(path,&stat_info)) {
|
||||
stats.create_time = stat_info.ctime;
|
||||
stats.create_time = (ulong) stat_info.ctime;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1784,7 +1784,7 @@ int ha_myisam::info(uint flag)
|
|||
stats.data_file_length= misam_info.data_file_length;
|
||||
stats.index_file_length= misam_info.index_file_length;
|
||||
stats.delete_length= misam_info.delete_length;
|
||||
stats.check_time= misam_info.check_time;
|
||||
stats.check_time= (ulong) misam_info.check_time;
|
||||
stats.mean_rec_length= misam_info.mean_reclength;
|
||||
}
|
||||
if (flag & HA_STATUS_CONST)
|
||||
|
@ -1792,7 +1792,7 @@ int ha_myisam::info(uint flag)
|
|||
TABLE_SHARE *share= table->s;
|
||||
stats.max_data_file_length= misam_info.max_data_file_length;
|
||||
stats.max_index_file_length= misam_info.max_index_file_length;
|
||||
stats.create_time= misam_info.create_time;
|
||||
stats.create_time= (ulong) misam_info.create_time;
|
||||
ref_length= misam_info.reflength;
|
||||
share->db_options_in_use= misam_info.options;
|
||||
stats.block_size= myisam_block_size; /* record block size */
|
||||
|
@ -1831,7 +1831,7 @@ int ha_myisam::info(uint flag)
|
|||
my_store_ptr(dup_ref, ref_length, misam_info.dupp_key_pos);
|
||||
}
|
||||
if (flag & HA_STATUS_TIME)
|
||||
stats.update_time = misam_info.update_time;
|
||||
stats.update_time = (ulong) misam_info.update_time;
|
||||
if (flag & HA_STATUS_AUTO)
|
||||
stats.auto_increment_value= misam_info.auto_increment;
|
||||
|
||||
|
|
Loading…
Reference in a new issue