lp:705210 Compiling with BUILD/compile-pentium64-debug fails

2 files changed, 6 insertions, 3 deletions

diff --git a/include/my_sys.h b/include/my_sys.h
index 0d57566d6e4..ff4083b9fda 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -902,10 +902,10 @@ void my_diff_and_hrtime(my_timediff_t *interval, my_hrtime_t *timestamp);
 extern ulonglong my_getsystime(void);
 
 #define my_micro_time()                 (my_getsystime()/10)
-#define hrtime_to_time(X)               ((my_time_t)((X).val/1000000))
+#define hrtime_to_time(X)               ((X).val/1000000)
 #define hrtime_from_time(X)             ((ulonglong)((X)*1000000ULL))
 #define hrtime_to_double(X)             ((X).val/1e6)
-#define hrtime_sec_part(X)              ((X).val%1000000)
+#define hrtime_sec_part(X)              ((ulong)((X).val%1000000))
 #define my_time(X)                      hrtime_to_time(my_hrtime())
 #define my_micro_and_hrtime(X,Y)        my_diff_and_hrtime(X,Y)
 
diff --git a/include/my_time.h b/include/my_time.h
index db1795eeb6e..5ec51685489 100644
--- a/include/my_time.h
+++ b/include/my_time.h
@@ -158,9 +158,12 @@ static inline longlong sec_part_unshift(longlong second_part, int digits)
 }
 static inline ulong sec_part_truncate(ulong second_part, int digits)
 {
-  return second_part - second_part % log_10_int[MAX_SEC_PART_DIGITS - digits];
+  /* the cast here should be unnecessary! */
+  return second_part - second_part % (ulong)log_10_int[MAX_SEC_PART_DIGITS - digits];
 }
 
+#define hrtime_to_my_time(X) ((my_time_t)hrtime_to_time(X))
+
 /* 
   Available interval types used in any statement.