mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Bug #39802 On Windows, 32-bit time_t should be enforced

Browse source 
This patch fixes compilation warning, "conversion from 'time_t' to 'ulong', 
possible loss of data". 
The fix is to typecast time_t to ulong before assigning it to ulong. 
Backported this from 6.0-bugteam tree.


storage/archive/ha_archive.cc:
  type casting time_t to ulong before assigning.
storage/federated/ha_federated.cc:
  type casting time_t to ulong before assigning.
storage/innobase/handler/ha_innodb.cc:
  type casting time_t to ulong before assigning.
storage/myisam/ha_myisam.cc:
  type casting time_t to ulong before assigning.
This commit is contained in:
Anurag Shekhar 2009-05-13 15:41:24 +05:30
commit da0fe3cb31
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
storage/archive/ha_archive.cc
View file

@ -1474,8 +1474,8 @@ int ha_archive::info(uint flag)
stats.mean_rec_length= table->s->reclength + buffer.alloced_length(); stats.mean_rec_length= table->s->reclength + buffer.alloced_length();
stats.data_file_length= file_stat.st_size; stats.data_file_length= file_stat.st_size;
stats.create_time= file_stat.st_ctime; stats.create_time= (ulong) file_stat.st_ctime;
stats.update_time= file_stat.st_mtime; stats.update_time= (ulong) file_stat.st_mtime;
stats.max_data_file_length= share->rows_recorded * stats.mean_rec_length; stats.max_data_file_length= share->rows_recorded * stats.mean_rec_length;
} }
stats.delete_length= 0; stats.delete_length= 0;

4
storage/federated/ha_federated.cc
View file

@ -2850,10 +2850,10 @@ int ha_federated::info(uint flag)
stats.data_file_length= stats.records * stats.mean_rec_length; stats.data_file_length= stats.records * stats.mean_rec_length;
if (row[12] != NULL) 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); &error);
if (row[13] != NULL) 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); &error);
} }
/* /*

2
storage/innobase/handler/ha_innodb.cc
View file

@ -6012,7 +6012,7 @@ ha_innobase::info(
nor the CHECK TABLE time, nor the UPDATE or INSERT time. */ nor the CHECK TABLE time, nor the UPDATE or INSERT time. */
if (os_file_get_status(path,&stat_info)) { if (os_file_get_status(path,&stat_info)) {
stats.create_time = stat_info.ctime; stats.create_time = (ulong) stat_info.ctime;
} }
} }

6
storage/myisam/ha_myisam.cc
View file

@ -1784,7 +1784,7 @@ int ha_myisam::info(uint flag)
stats.data_file_length= misam_info.data_file_length; stats.data_file_length= misam_info.data_file_length;
stats.index_file_length= misam_info.index_file_length; stats.index_file_length= misam_info.index_file_length;
stats.delete_length= misam_info.delete_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; stats.mean_rec_length= misam_info.mean_reclength;
} }
if (flag & HA_STATUS_CONST) if (flag & HA_STATUS_CONST)
@ -1792,7 +1792,7 @@ int ha_myisam::info(uint flag)
TABLE_SHARE *share= table->s; TABLE_SHARE *share= table->s;
stats.max_data_file_length= misam_info.max_data_file_length; stats.max_data_file_length= misam_info.max_data_file_length;
stats.max_index_file_length= misam_info.max_index_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; ref_length= misam_info.reflength;
share->db_options_in_use= misam_info.options; share->db_options_in_use= misam_info.options;
stats.block_size= myisam_block_size; /* record block size */ 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); my_store_ptr(dup_ref, ref_length, misam_info.dupp_key_pos);
} }
if (flag & HA_STATUS_TIME) 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) if (flag & HA_STATUS_AUTO)
stats.auto_increment_value= misam_info.auto_increment; stats.auto_increment_value= misam_info.auto_increment;