mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 11:57:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove ut_win_init_time from innodb

Browse source 
The patch was brought in from 5.6.39 merge and we don't need it in
MariaDB
This commit is contained in:
Vicențiu Ciorbaru 2018-01-25 19:48:36 +02:00
commit 61e2f43e05
3 changed files with 0 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
storage/innobase/handler/ha_innodb.cc
View file

@ -3643,12 +3643,6 @@ innobase_change_buffering_inited_ok:
/* 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);

9
storage/innobase/include/ut0ut.h
View file

@ -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 */

17
storage/innobase/ut/ut0ut.cc
View file

@ -59,23 +59,6 @@ http://support.microsoft.com/kb/167296/ */
#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 */