From 1a873fb865622819c11f33fa73d6971bfa27ce14 Mon Sep 17 00:00:00 2001 From: Eric Herman Date: Thu, 8 Jun 2017 12:27:16 +0200 Subject: [PATCH] replace my_timer_microseconds with microsecond_interval_timer As svoj points out, my_timer_microseconds uses gettimeofday which is affected by "discontinuous jumps in the system time", according to man. This patch changes to use microsecond_interval_timer which is "not perfect, but is less affected by these jumps", and also does not require an include of my_rdtsc.h header. https://github.com/MariaDB/server/pull/332#discussion_r114708923 --- client/mysql.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/mysql.cc b/client/mysql.cc index bc3d6963052..6669f9668db 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -34,7 +34,6 @@ #include #include #include -#include #ifndef __GNU_LIBRARY__ #define __GNU_LIBRARY__ // Skip warnings in getopt.h #endif @@ -5035,7 +5034,7 @@ void tee_putc(int c, FILE *file) static ulonglong start_timer(void) { - return my_timer_microseconds(); + return microsecond_interval_timer(); }