From: Date: April 30 2009 2:34pm Subject: bzr commit into mysql-5.1-bugteam branch (v.narayanan:2880) Bug#39802 Bug#40092 List-Archive: http://lists.mysql.com/commits/73143 X-Bug: 39802,40092 Message-Id: <20090430123434.E912F77@sa64-v40za-blr03.india.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0154020752==" --===============0154020752== 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 Changed 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 12:34:20 +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(): --===============0154020752== 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: 86a3fba58328c63bff97a27e44115f79738a91f7 # timestamp: 2009-04-30 18:04:34 +0530 # base_revision_id: satya.bn@stripped # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXz1cO4AAelfgEAwWXf//3sh 3YC////wUATYiyzYeRwdyurtwkpMmiDTCY0mQm0FMIaBk0DT1G1AMpGIxGQGqPSZDE9QGgGgGgAC SCJMmJpqPSZRP0kbQgY1PTagTanqehHocwCYCZGAEYmJhMJghpiaYCSSMpgjETQwnpGTT0jQA0AA Bjwgy7DPjRm+n07yzdToGLFIwYM/Nw5FCjIMJbyxxJjpkXXdbuOWjJmz+R4TZuHfGh0kRI7ZKprY t6WPCS35kw5N55LQ/9v82mqKx3VHni53MVL6cnkYi8e8jPk7gLRRQZHjH7uePdun04XOrexvelFf TqckUhNpNfGKo0mdUKEohvOJkRtvqYpad6YLLtsaU+aumYggjolj2WD/gJ8nCjPIkyasXW517He9 QxTRFyjThOFNSEzKWOhBkoAIqrB+c3nqP0zF1rC/YOxizdSXmor1zJKBDLWsKLUA8d8yotG7cJ0i FKJBhGItL0pYJez5IyBIVUKREX2qMt4WDSSJiqFrKikmgWNDTwMFSoa9F9lvuLLUFVMmRYK203l2 J2mdKGFMzQGs0EIV3izvp0zjpyqOMsFQRIGmUe7Y5hDCocZSQmLOiZMQ0lFleS5NyQIVPnVis4Js +pXmWuEo1YD8WwuOruoEaW255DAbYzPRe8XIAaIVhgocNozi6VIhzUeU2p8FrQWWOqmhrIkZO6Yb UuoUkGy7a4wyugo5q1ME8RfuN2jS4uTL0TeVH9LLMN7HD2Gfsirw1WiT1yI4LvoYsMd2XphHfVff 7Hw+WPhGC/0GH+rhdsy6HHGBub3aUPVVL5sDErgVDpPyOojxmzTZldBg2RUqDAXQH1zAVVwSnFr8 VfCgYYjovJlQBr0moa0qNxdhXPsVkcmhHIG1ETmspO1+OXYsY51ufYkUQ+rrFVW8hzzbdDMpkXal FVtIYkXaYLRbWMLEu2D2+aVqIL+d6M0QMN1BO8jzsJtdrwqHGmZapCiKCubyA67CKPfOleMcxuYn kmRejGiazG0TCSK4pqCNqjAkTq5cBQNic05OLRgXGY0eW+33QLheC3Q2hGvBScnCrBl28ImJMRTz j01LqJ8PUHCLyFF1BbClfP0HyquJZf5OLMWrOEpaWa2+KTDBcjXeK5dqeAbF2BSdanu9N7ZKwNoE ws2c7+153a2C1oxUcAzxrEMyyKXeXfTCdiGo5SCangMXMSbOYkT75wUVBAKSgi7HCUXrZpnnDXlx rs+8lLO8oyczyE4h84onEk6YTgxpwFqWlxKDIZD2JhyUScpdGDo0YIBKyGWVQsG3YftWUFIBbYlB FhLCOKQ2ahyaRAiDxo0ZwJsxWNYcCjHA0mE0znFBgUSnJuoVISwlMrLEhmVKWaMBxiC2IUKePDWy i4stWXr3zsFUqwS6zWONA9A1Rm2Zr28FBRy8qLAGdIohUKQvtczxjpQkuSxg1oh156HkM/A808S7 aSoYVWyoWWzC7NLeowQUSrgnKeIwYgzEjFlg0JRbVxV61cX1rxDdUS0Jb1QIiTNArWqHSwsTby21 k1YwOFXraCtPV1YaRtQnDmWQBlGyoTRIZU35TUlrDGs/4u5IpwoSD56uHcA= --===============0154020752==--