From: Date: February 23 2007 5:59pm
Subject: bk commit into 5.1 tree (msvensson:1.2459) BUG#26536
List-Archive: http://lists.mysql.com/commits/20473
X-Bug: 26536
Message-Id: <200702231659.l1NGxGii024114@pilot.blaudden>

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-23 17:59:07+01:00, msvensson@stripped +1 -0
  Bug#26536 func_time failure on vm-win2003-64-b, occurs every time
   - Fixes for 5.1
   - Always use long for my_time_t

  include/my_time.h@stripped, 2007-02-23 17:59:05+01:00, msvensson@stripped +1 -7
    Use long for my_time_t
    It should be signed and hold seconds for 1902 -- 2038-01-19 range
    i.e at least a 32bit variable
    
    Using the system built in time_t is not an option as
    we rely on the above requirements in the time functions
    
    For example QNX has an unsigned time_t type

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/bug26536/my51-bug26536

--- 1.28/include/my_time.h	2007-02-23 17:34:16 +01:00
+++ 1.29/include/my_time.h	2007-02-23 17:59:05 +01:00
@@ -38,13 +38,7 @@ extern uchar days_in_month[];
 
   For example QNX has an unsigned time_t type
 */
-#if defined(_WIN64) || defined(WIN64)
-/* on Win64 long is still 4 bytes (not 8!) */
-typedef LONG64 my_time_t;
-#else
-typedef time_t my_time_t;
-
-#endif
+typedef long my_time_t;
 
 #define MY_TIME_T_MAX LONG_MAX
 #define MY_TIME_T_MIN LONG_MIN