diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-04-26 14:13:58 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-04-26 14:13:58 +0200 |
| commit | c74848ba141a813c8cf9a88c5e9c3cb0278d1a3b (patch) | |
| tree | 103d8bc0c0bcd7bfdeca6a333c50574249c30cb5 /storage/xtradb/include/ut0ut.h | |
| parent | 584137879f00c4d532b1b2b76f754af3061017be (diff) | |
| parent | 6b84fdb2f32e52299809c0bb771dfeefdb17be03 (diff) | |
| download | mariadb-git-c74848ba141a813c8cf9a88c5e9c3cb0278d1a3b.tar.gz | |
Merge branch 'merge-xtradb-5.6' into 10.0
Diffstat (limited to 'storage/xtradb/include/ut0ut.h')
| -rw-r--r-- | storage/xtradb/include/ut0ut.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/storage/xtradb/include/ut0ut.h b/storage/xtradb/include/ut0ut.h index a68613abac3..5ec7cb1a4f8 100644 --- a/storage/xtradb/include/ut0ut.h +++ b/storage/xtradb/include/ut0ut.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1994, 2017, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -268,6 +268,15 @@ UNIV_INTERN ulint ut_time_ms(void); /*============*/ +#ifdef _WIN32 +/**********************************************************//** +Initialise highest available time resolution API on Windows +@return 0 if all OK else -1 */ +int +ut_win_init_time(); + +#endif /* _WIN32 */ + #endif /* !UNIV_HOTBACKUP */ /**********************************************************//** |