diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt

index f4a6a6d55b3..f4ed7ee7df4 100644

--- a/mysys/CMakeLists.txt

+++ b/mysys/CMakeLists.txt

@@ -43,7 +43,7 @@ SET(MYSYS_SOURCES  array.c charset-def.c charset.c checksum.c my_default.c

                                 safemalloc.c my_new.cc

 				my_getncpus.c my_safehash.c my_chmod.c my_rnd.c

                                 my_uuid.c wqueue.c waiting_threads.c ma_dyncol.c ../sql-common/my_time.c

-				my_rdtsc.c my_context.c psi_noop.c

+				my_rdtsc.cc my_context.c psi_noop.c

                                 my_atomic_writes.c my_cpu.c my_likely.c

                                 file_logger.c my_dlerror.c)

diff --git a/mysys/my_rdtsc.cc b/mysys/my_rdtsc.cc

index 2d93239f7dd..0f37183f17c 100644

--- a/mysys/my_rdtsc.cc

+++ b/mysys/my_rdtsc.cc

@@ -55,6 +55,8 @@

 #include "my_global.h"

 #include "my_rdtsc.h"

+#include <chrono>

+

 #if defined(_WIN32)

 #include <stdio.h>

 #include "windows.h"

@@ -95,33 +97,9 @@

 ulonglong my_timer_nanoseconds(void)

 {

-#if defined(HAVE_READ_REAL_TIME)

-  {

-    timebasestruct_t tr;

-    read_real_time(&tr, TIMEBASE_SZ);

-    return (ulonglong) tr.tb_high * 1000000000 + (ulonglong) tr.tb_low;

-  }

-#elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME)

-  /* SunOS 5.10+, Solaris, HP-UX: hrtime_t gethrtime(void) */

-  return (ulonglong) gethrtime();

-#elif defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_REALTIME)

-  {

-    struct timespec tp;

-    clock_gettime(CLOCK_REALTIME, &tp);

-    return (ulonglong) tp.tv_sec * 1000000000 + (ulonglong) tp.tv_nsec;

-  }

-#elif defined(__APPLE__) && defined(__MACH__)

-  {

-    ulonglong tm;

-    static mach_timebase_info_data_t timebase_info= {0,0};

-    if (timebase_info.denom == 0)

-      (void) mach_timebase_info(&timebase_info);

-    tm= mach_absolute_time();

-    return (tm * timebase_info.numer) / timebase_info.denom;

-  }

-#else

-  return 0;

-#endif

+  return std::chrono::duration_cast<std::chrono::nanoseconds>(

+             std::chrono::steady_clock::now().time_since_epoch())

+      .count();

 }

 /*

@@ -135,35 +113,9 @@ ulonglong my_timer_nanoseconds(void)

 ulonglong my_timer_microseconds(void)

 {

-#if defined(HAVE_GETTIMEOFDAY)

-  {

-    static ulonglong last_value= 0;

-    struct timeval tv;

-    if (gettimeofday(&tv, NULL) == 0)

-      last_value= (ulonglong) tv.tv_sec * 1000000 + (ulonglong) tv.tv_usec;

-    else

-    {

-      /*

-        There are reports that gettimeofday(2) can have intermittent failures

-        on some platform, see for example Bug#36819.

-        We are not trying again or looping, just returning the best value possible

-        under the circumstances ...

-      */

-      last_value++;

-    }

-    return last_value;

-  }

-#elif defined(_WIN32)

-  {

-    /* QueryPerformanceCounter usually works with about 1/3 microsecond. */

-    LARGE_INTEGER t_cnt;

-

-    QueryPerformanceCounter(&t_cnt);

-    return (ulonglong) t_cnt.QuadPart;

-  }

-#else

-  return 0;

-#endif

+  return std::chrono::duration_cast<std::chrono::microseconds>(

+             std::chrono::steady_clock::now().time_since_epoch())

n+      .count();

 }

 /*

@@ -175,41 +127,9 @@ ulonglong my_timer_microseconds(void)

 ulonglong my_timer_milliseconds(void)

 {

-#if defined(HAVE_SYS_TIMEB_H) && defined(HAVE_FTIME)

-  /* ftime() is obsolete but maybe the platform is old */

-  struct timeb ft;

-  ftime(&ft);

-  return (ulonglong)ft.time * 1000 + (ulonglong)ft.millitm;

-#elif defined(HAVE_TIME)

-  return (ulonglong) time(NULL) * 1000;

-#elif defined(_WIN32)

-   FILETIME ft;

-   GetSystemTimeAsFileTime( &ft );

-   return ((ulonglong)ft.dwLowDateTime +

-                  (((ulonglong)ft.dwHighDateTime) << 32))/10000;

-#else

-  return 0;

-#endif

-}

-

-/*

-  For ticks, which we handle with times(), the frequency

-  is usually 100/second and the overhead is surprisingly

-  bad, sometimes even worse than gettimeofday's overhead.

-*/

-

-ulonglong my_timer_ticks(void)

-{

-#if defined(HAVE_SYS_TIMES_H) && defined(HAVE_TIMES)

-  {

-    struct tms times_buf;

-    return (ulonglong) times(&times_buf);

-  }

-#elif defined(_WIN32)

-  return (ulonglong) GetTickCount();

-#else

-  return 0;

-#endif

+  return std::chrono::duration_cast<std::chrono::milliseconds>(

+             std::chrono::steady_clock::now().time_since_epoch())

+      .count();

 }

 /*