Remove ut_win_init_time from innodb

The patch was brought in from 5.6.39 merge and we don't need it in MariaDB
MariaDB · Jan 25, 2018 · 61e2f43 · 61e2f43
1 parent a0702db
commit 61e2f43
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 32 deletions.
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
@@ -3643,12 +3643,6 @@ innobase_init(
 	/* Turn on monitor counters that are default on */
 	srv_mon_default_on();
 
-#ifndef UNIV_HOTBACKUP
-#ifdef _WIN32
-	ut_win_init_time();
-#endif /* _WIN32 */
-#endif /* !UNIV_HOTBACKUP */
-
 	DBUG_RETURN(FALSE);
 error:
 	DBUG_RETURN(TRUE);

diff --git a/storage/innobase/include/ut0ut.h b/storage/innobase/include/ut0ut.h
@@ -273,15 +273,6 @@ UNIV_INTERN
 ulint
 ut_time_ms(void);
 /*============*/
-#ifdef _WIN32
-/**********************************************************//**
-Initialise highest available time resolution API on Windows.
-Crashes if there's an error loading kernel32.dll.
-*/
-void
-ut_win_init_time();
-
-#endif /* _WIN32 */
 
 #endif /* !UNIV_HOTBACKUP */
 

diff --git a/storage/innobase/ut/ut0ut.cc b/storage/innobase/ut/ut0ut.cc
@@ -59,23 +59,6 @@ epoch starts from 1970/1/1. For selection of constant see:
 #define WIN_TO_UNIX_DELTA_USEC  ((ib_int64_t) 11644473600000000ULL)
 
 
-/**
-Initialise highest available time resolution API on Windows.
-Crashes if there's an error loading kernel32.dll.
-*/
-void
-ut_win_init_time()
-{
-	HMODULE h = LoadLibrary("kernel32.dll");
-	ut_a(h);
-	time_fn pfn = (time_fn)GetProcAddress(h, "GetSystemTimePreciseAsFileTime");
-	if (pfn != NULL)
-	{
-		ut_get_system_time_as_file_time = pfn;
-	}
-	return;
-}
-
 /*****************************************************************//**
 This is the Windows version of gettimeofday(2).
 @return	0 if all OK else -1 */