diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-31 18:09:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-31 18:09:08 +0300 |
| commit | 9216114ce729733e6b0c4ce952bfdf57595ff387 (patch) | |
| tree | 7a541ed87a6a8174d3d94c5f780724a34e08dc1c /mysys | |
| parent | dc513dff911d72eaaf9f752f390fef8d1ef9a4b0 (diff) | |
| parent | 66ec3a770f7854f500ece66c78f3c87c9cd6da15 (diff) | |
| download | mariadb-git-9216114ce729733e6b0c4ce952bfdf57595ff387.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_rdtsc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysys/my_rdtsc.c b/mysys/my_rdtsc.c index 2d93239f7dd..c707588da01 100644 --- a/mysys/my_rdtsc.c +++ b/mysys/my_rdtsc.c @@ -609,7 +609,11 @@ void my_timer_init(MY_TIMER_INFO *mti) time1= my_timer_cycles(); time2= my_timer_ticks(); time3= time2; /* Avoids a Microsoft/IBM compiler warning */ +#if defined(HAVE_SYS_TIMES_H) && defined(HAVE_TIMES) + for (i= 0; i < 1000; ++i) +#else for (i= 0; i < MY_TIMER_ITERATIONS * 1000; ++i) +#endif { time3= my_timer_ticks(); if (time3 - time2 > 10) break; |