microseconds in log tables:

  TIMESTAMP -> TIMESTAMP(6)
  TIME -> TIME(6)
in general_log and slow_log tables.

include/my_sys.h:
  use constants

1 files changed, 4 insertions, 4 deletions

diff --git a/include/my_sys.h b/include/my_sys.h
index 48370ea7c38..1b8da17006f 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -894,17 +894,17 @@ extern ulong crc32(ulong crc, const uchar *buf, uint len);
 extern uint my_set_max_open_files(uint files);
 void my_free_open_file_info(void);
 
-#define HRTIME_RESOLUTION               1000000  /* microseconds */
+#define HRTIME_RESOLUTION               1000000ULL  /* microseconds */
 typedef struct {ulonglong val;} my_hrtime_t;
 void my_time_init();
 extern my_hrtime_t my_hrtime();
 extern ulonglong my_interval_timer(void);
 
 #define microsecond_interval_timer()    (my_interval_timer()/1000)
-#define hrtime_to_time(X)               ((X).val/1000000)
-#define hrtime_from_time(X)             ((ulonglong)((X)*1000000ULL))
+#define hrtime_to_time(X)               ((X).val/HRTIME_RESOLUTION)
+#define hrtime_from_time(X)             ((ulonglong)((X)*HRTIME_RESOLUTION))
 #define hrtime_to_double(X)             ((X).val/(double)HRTIME_RESOLUTION)
-#define hrtime_sec_part(X)              ((ulong)((X).val%1000000))
+#define hrtime_sec_part(X)              ((ulong)((X).val % HRTIME_RESOLUTION))
 #define my_time(X)                      hrtime_to_time(my_hrtime())
 
 extern my_bool my_gethwaddr(uchar *to);