summaryrefslogtreecommitdiff
path: root/storage/archive
diff options
context:
space:
mode:
authorAnurag Shekhar <anurag.shekhar@sun.com>2009-05-13 15:41:24 +0530
committerAnurag Shekhar <anurag.shekhar@sun.com>2009-05-13 15:41:24 +0530
commitda0fe3cb31c80b2b218285cf02c72a70be3b402f (patch)
treefb8262c6f65d475782cb47eccddf3a4dcdc8a5d0 /storage/archive
parentbd59628754d7f6ced2c19286c041b1ee5ce354e0 (diff)
downloadmariadb-git-da0fe3cb31c80b2b218285cf02c72a70be3b402f.tar.gz
Bug #39802 On Windows, 32-bit time_t should be enforced
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.
Diffstat (limited to 'storage/archive')
-rw-r--r--storage/archive/ha_archive.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc
index 5e2a4ad5da3..1146b2eb73a 100644
--- a/storage/archive/ha_archive.cc
+++ b/storage/archive/ha_archive.cc
@@ -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;