From: Date: May 4 2009 12:00pm
Subject: bzr commit into mysql-5.1-bugteam branch (v.narayanan:2891) Bug#39802
List-Archive: http://lists.mysql.com/commits/73286
X-Bug: 39802
Message-Id: <20090504100030.E4B7077@sa64-v40za-blr03.india.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1997973223=="

--===============1997973223==
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:serge.kozlov@stripped

 2891 Narayanan V	2009-05-04
      BUG#39802 On Windows, 32-bit time_t should be enforced
      
      A backport of fix for "BUG40092 - Storage engine API uses
      time_t datatype".
      
      Starting from MSVC C++ 2005 (v8), the default size of time_t
      is changed from 32-bit to 64-bit. As the result, the binaries
      built with pre-v8 MSVC C++ do not work with the binaries
      (storage engine plugins) built with v8 or after (server
      crashes).
      
      Fixed storage engine API to use datatype with known size
      (ulong) instead of time_t.
     @ sql/handler.h
        Bug#39802 On Windows, 32-bit time_t should be enforced
        
        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-05-04 10:00:15 +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():


--===============1997973223==
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: 486d72f338a0c05d9e10acd0ba09e44b6ffabbd0
# timestamp: 2009-05-04 15:30:30 +0530
# base_revision_id: serge.kozlov@stripped\
#   nud9azfhu2rmwels
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWz6mSoAAhBfgEAwWX///3uj
34C////wUAVjTaKF3jE08tevVdwZFMVP01NJ5R6nhU8E9U/SbU9SeowGjQMoekHoEkkaTaPU0CRk
0elDRoyB6QAAANASUyCaTEIn6JhIbSAD1HqND1GgNAASKKTxJ6geTUDRpiGNQAAAaA9IBJIjITR6
QxJ6mTTKeTUNGgeUMgABklxRBe8TCfM5E27dQqqbWEG7XGXBAJkRackTEDkI3IAzKtgjZP74euDw
YeHCsdNGIeeFCiU7BKyHAFX68zhnH7ax2RIkoGXpHBXIOK6a5BRX+HCQZmcewPaoYtKUoRvTbv3b
S+2bXx7Kja7qUx5Jxsg18ChmhYzk84+elCExn4+UOF8wVkJA/iQc0Oe7PNHbazociydwMWeaWdoB
1z2sN4THO1V0ssGgMEtdiupLJARo91SgGI032KhhV3HA02t4bZvLihRvvZB3USXYl08OI1esXcl0
yndlJKiiENG27RepOJnSKDp07CkOUTMvDGInG1IIkhwTJzV0NV+TgdNVw7FrNwkKLqqqCY0uprhz
e7CzDKntNiRumwnnXfzZxXbOtYRc/aGNT3FxDJSmwikqvaCdQI7CRJbjWa9QSxX8XYrPKJy2wK1F
4q23jLeQ9plHWXSoMWhzdfarl58+V6q/fRiIp4sTIxKjPrFukatMSgJnEcphdkXJYNhnFBneUbFu
5DatpCqzFGzoTmkWrm+zQpWs/uIqblgb/fScbkbzMezvQW+5o5mbXhylpa6NxrUh7GJlZmtwvEK9
Ogkapb6SC2cheYFIxFEAdTVFDFk8IDDJ5EYEK2CreLqJ9Y8mF8ILdG+g3fdllDXA2cDx+h5s8Jwe
Jvj21AV/OdjlIsZqTZa/IlJD4dhnn5mJDz9tD6jaXuvsnjasrI5hqVt2tw4YGw7ZtLcYJfdgY6SA
dQN4R38aDJ1LGmD4zSVDASAnjiAlZBKsTFHKj2LKqxhiMF64AXclIXYXDVGX0DHTwwTzkF1kH656
nI9Re8zFY4zHGWutsFe+hNpfgkSwgD1oq8RisOFmYlmK2J5JsxapC7hccq6hsHMKojA47uRzoPV0
tcOs70mz5CwbTRNVrjmLY0FG2LqZ0SxKqISRJK6GQGXtHk352UkMKNeyc3qF6IckyGxyRRlfotC8
Tc41OJ5ntCadgKE+i5jWHMalM81aB6nLjtNRIy5l8923fzrxQ2kWNYhM3u9S45EtZl1yKCaUERps
hVQsJq7YZAyObpDLfYu78QIozuVPfVITFyzLAKS8u0v9yUw44GmgWhVmtQAL63nlCw4KbRF8f9tg
+0B2oCOIOsF82p505MlSAWF/0Alyl5dtAgVrGP2y8aEREaFLSBmN5WIJdJZgafuQY9INBsaQGFCK
ruWIV44XveITHArXq7v2Y6e4r2aJ4ViJ3MRSYOhOA6EoHneOBkNGcyYgEGEVFafMKaurLXcnLYNo
tqCwqXHush1i00+GRONgKoDfuAmSphUk4wZbh6rvuKU+RcsUSFi5z8/cCWiqOBMXfdXq2GNddLum
KFaWzCu3DIzanAOS3YTAPIPDxzClKXW6xk/EiMSoJdgatJPAU7CxmCcGUFhtl1x2XNtIVIQxXLM9
O1b40csK7TIAw/EsFUXtRtmHVBGyqrHAOaPkEPoyNtYy2qBohY8emNC/qMMeMJEYCajbNFCuQJOj
z4VymCCfMyHxcp8jIkDMTsquItUwUElvWnhPSrV78+64TKiekV16VOJMRFOaBsfuAwJ31gkn0VSr
lHDfAyKjqsgmCTMaFSxVmQzDawNBeAVJGatKFRVI2sQWdLp9uS/4u5IpwoSDZ9TJUA==


--===============1997973223==--