From: Narayanan V Date: April 30 2009 9:31am Subject: bzr commit into mysql-5.1-bugteam branch (v.narayanan:2880) Bug#39802 Bug#40092 List-Archive: http://lists.mysql.com/commits/73151 X-Bug: 39802,40092 Message-Id: <20090430093158.784A377@sa64-v40za-blr03.india.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1935044161==" --===============1935044161== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///export/home/log/Narayanan/mysql_checkouts_bazaar/5.1_main_repository/mysql-5.1-bugteam-40092-39802/ based on revid:satya.bn@stripped 2880 Narayanan V 2009-04-30 Bug#39802 On Windows, 32-bit time_t should be enforced Bug#40092 Storage engine API uses time_t datatype Change the usage of time_t in the storage engine API to datatypes with known size @ sql/handler.h Bug#39802 On Windows, 32-bit time_t should be enforced Bug#40092 Storage engine API uses time_t datatype Change create_time, check_time, update_time in the ha_statistics and PARTITION_INFO structures to ulong. modified: sql/handler.h === modified file 'sql/handler.h' --- a/sql/handler.h 2008-12-10 20:14:50 +0000 +++ b/sql/handler.h 2009-04-30 09:31:44 +0000 @@ -876,9 +876,9 @@ typedef struct { ulonglong delete_length; ha_rows records; ulong mean_rec_length; - time_t create_time; - time_t check_time; - time_t update_time; + ulong create_time; + ulong check_time; + ulong update_time; ulonglong check_sum; } PARTITION_INFO; @@ -1037,9 +1037,9 @@ public: ha_rows records; ha_rows deleted; /* Deleted records */ ulong mean_rec_length; /* physical reclength */ - time_t create_time; /* When table was created */ - time_t check_time; - time_t update_time; + ulong create_time; /* When table was created */ + ulong check_time; + ulong update_time; uint block_size; /* index block size */ ha_statistics(): --===============1935044161== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/v.narayanan@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: v.narayanan@stripped # target_branch: file:///export/home/log/Narayanan\ # /mysql_checkouts_bazaar/5.1_main_repository/mysql-5.1-bugteam-\ # 40092-39802/ # testament_sha1: b2ca05b3582de0dbd39eb2e07ceae7f23c7434d3 # timestamp: 2009-04-30 15:01:58 +0530 # base_revision_id: satya.bn@stripped # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbvqGdkAAfHfgEAwWXf//3sh 3YC////wUATYt7szrmx3Zwm2ytwklGmk00NNNME1TwNTU/UIeUHqGjQaNpAymhU/JqbI0ao0M1AA BoHqAAACRIJNGmmpino1NimTygDTTTQD0hoAcwCYCZGAEYmJhMJghpiaYCSRMiY0IxT00U2p6nqZ ojIBpkNA00aX65GHYZ9tG+PHYWaqcoy3EqDDK40a+0oUaCs+eW0nOd3oqL2ZMeo7fA03n+R3zs1E RhQ3EpTIfIqmRlu5nfMt+ZOyClx4Zh/X3chGOsuNSKfmDuZUuo5DIyEUREfJ14ss0xI8Z+797+/d No1Vu2va3klBBPa5InDLQM+8lwvEjacrwQv3RSDY17lF6AzuMMKMbP1OWKiBgjxS39OJH4Cto4ab J0r3XPdm2PvUd6eIwThQUwpokJtSugaC0vU1yjoxBiWMxkzScDo61flzEMWKV01tiYl2L2FQkzM9 GmHDe5tIDC4QBhXkFmemmLzayA+ZhQCB0xWKFZVIQJDCyc9KJZbUJdnwBYdDgVzGK8BfxZ1mitBQ uSFooldZpKczX2GMXllJGgsFffhT5qNU4mkQkYRgSGQax5SRShyrXyXBOWF/mm1FWknosKaCxOx1 j56JliWnsUM2KumBdfQWuNSkq5dzjHclIqv53LaMctrY2FjBSVsNqMniYcdQsKrC2DMsha1cnLIg ssgxtsVDUSJk1EJjqpBDpi54GNYpE4LLGE8BZT3qJwL4tcJ3FSPI1gFLFXM7ucL4IWe0Ljk4RYvK IzMMfrsnhR5PXp1PDxzf18l4Aw7xcFNt2ThwwNf2YwPjFLvYGJlmRDccB3l1lO+l551IGDumtU7A SAhpqAu0xSrF1bxd6vCQwxCVqZMKQHVWcToGoGHFxkvkRq7Vumo3SOQUWJDFAvWdE1rsNEiSGkJU 0vxCcspBmgPcV0XUS0lBbi5aVgzLYl7pHRs0UUWjL/FDbigxy7DIfRWcB4pVQeqDdDAqUwQRAVbb AyHrtJm5n5x3P5DYxN80yJI4aa8+GwTE7tpfeEHqAE6mxowDSWmxROPjWRFhkJvtfX8LDouFewHK 9P4uFQDWRC4QsmZJqBMp/5HRoW0z3esNUDaw0VaF8+o+NUwKT/YylXC1BiLCp0PRJi5Xl4tdwrF3 qMArytgE5InV9d8MekD1AY5T3YRHbKK65G1PrDJGvEMixrFwLPC65kPRxcoAc9VEy2+tIn3rCCgM KZMjDmzeYx0caKCmxVK7T/tktHcV7euBGoRBzE9KYTg2JwHQlzuMQNDRRlpCUlCv36OvfoqFrQ1t Vdw+av3w2AsQGGxJ6UiUiMIFo5ndeTImzHDhvCPWnnQlE3G1SVs89VSYvT1UU2BRDbrAsS3PAcaw 4vFZZ04XNSxllqzerlnmFUqwnC5FffQN46jebOurmLBOZWC4wNoDi1XK0zuzpmRaFltsw0+URGWq KlmsXo3xMvwV3kyewotqgT0zPXuy0cCxBBKNicQ8hgvBssax65BiF2rgti5+FdK+AdOcxYJb1gIh PVCr89xuTbVUru3UBxWXDIZ1aJ6zKnOMwzJwDKFlkNQQrZmooWMqqNLT/i7kinChIXfUM7I= --===============1935044161==--