From: Date: May 13 2009 12:11pm Subject: bzr commit into mysql-5.1-bugteam branch (anurag.shekhar:2875) Bug#39802 List-Archive: http://lists.mysql.com/commits/73919 X-Bug: 39802 Message-Id: <0KJK00CYRUZ5MZG0@mail-apac.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_HOiYP+FtYYqANG/uL2aRjg)" --Boundary_(ID_HOiYP+FtYYqANG/uL2aRjg) MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7BIT Content-disposition: inline #At file:///E:/mysqlsrc/mysql-5.1-bugteam-windows-warning/ based on revid:gshchepa@stripped 2875 Anurag Shekhar 2009-05-13 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. modified: storage/archive/ha_archive.cc storage/federated/ha_federated.cc storage/innobase/handler/ha_innodb.cc storage/myisam/ha_myisam.cc === modified file 'storage/archive/ha_archive.cc' === modified file 'storage/archive/ha_archive.cc' --- a/storage/archive/ha_archive.cc 2009-03-26 14:27:34 +0000 +++ b/storage/archive/ha_archive.cc 2009-05-13 10:11:24 +0000 @@ -1474,8 +1474,8 @@ 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; === modified file 'storage/federated/ha_federated.cc' --- a/storage/federated/ha_federated.cc 2009-02-13 16:41:47 +0000 +++ b/storage/federated/ha_federated.cc 2009-05-13 10:11:24 +0000 @@ -2850,10 +2850,10 @@ 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); } /* === modified file 'storage/innobase/handler/ha_innodb.cc' --- a/storage/innobase/handler/ha_innodb.cc 2009-04-15 12:41:54 +0000 +++ b/storage/innobase/handler/ha_innodb.cc 2009-05-13 10:11:24 +0000 @@ -6012,7 +6012,7 @@ 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; } } === modified file 'storage/myisam/ha_myisam.cc' --- a/storage/myisam/ha_myisam.cc 2009-04-30 12:52:48 +0000 +++ b/storage/myisam/ha_myisam.cc 2009-05-13 10:11:24 +0000 @@ -1784,7 +1784,7 @@ 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 @@ 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 @@ 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; --Boundary_(ID_HOiYP+FtYYqANG/uL2aRjg) MIME-version: 1.0 Content-type: text/bzr-bundle; name="bzr/anurag.shekhar@stripped"; charset=us-ascii Content-transfer-encoding: 7BIT Content-disposition: inline; filename="bzr/anurag.shekhar@stripped" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: anurag.shekhar@stripped # target_branch: file:///E:/mysqlsrc/mysql-5.1-bugteam-windows-\ # warning/ # testament_sha1: 8766cba9b46703036f09db7f64540f1a041e02a2 # timestamp: 2009-05-13 15:41:30 +0530 # base_revision_id: gshchepa@stripped # # Begin bundle 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 1ur0ZaVGVsoc1/4u5IpwoSEvsMlo --Boundary_(ID_HOiYP+FtYYqANG/uL2aRjg)--