summaryrefslogtreecommitdiff
path: root/storage/innobase/srv
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-07-25 10:30:28 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-07-25 10:43:11 +0300
commitf6ea0389a4ea61dd0accbc3f949ef6c6d9a91417 (patch)
tree85b3d06e5a4a1e6a90f8d87d8ccd89034e8e8a56 /storage/innobase/srv
parente32f29b7f31945d2e89d601cb030b3552c3bfde3 (diff)
downloadmariadb-git-f6ea0389a4ea61dd0accbc3f949ef6c6d9a91417.tar.gz
Replace ut_timer() with my_interval_timer()
The function pointer ut_timer() was only used by the InnoDB defragmenting thread. Let InnoDB use a single monotonic high-precision timer, my_interval_timer() [in nanoseconds], occasionally wrapped by microsecond_interval_timer(). srv_defragment_interval: Change from "timer" units to nanoseconds. This concludes the InnoDB time function cleanup that was motivated by MDEV-14154. Only ut_time_ms() will remain for now, wrapping my_interval_timer().
Diffstat (limited to 'storage/innobase/srv')
-rw-r--r--storage/innobase/srv/srv0start.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc
index 3c63b28ed5b..a73e67e9f5b 100644
--- a/storage/innobase/srv/srv0start.cc
+++ b/storage/innobase/srv/srv0start.cc
@@ -43,7 +43,6 @@ Created 2/16/1996 Heikki Tuuri
#include "pars0pars.h"
#include "row0ftsort.h"
#include "ut0mem.h"
-#include "ut0timer.h"
#include "mem0mem.h"
#include "data0data.h"
#include "data0type.h"
@@ -1669,9 +1668,6 @@ innobase_start_or_create_for_mysql()
os_fast_mutex_free(&srv_os_test_mutex);
- /* This should be initialized early */
- ut_init_timer();
-
if (srv_force_recovery == SRV_FORCE_NO_LOG_REDO) {
srv_read_only_mode = 1;
}