diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-19 13:49:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-19 13:49:52 +0300 |
| commit | d1edb011eead8401bf14c8d1e90a6fb3f2a4d6e9 (patch) | |
| tree | be790548e486e06aff1b346aeb6641a279ffb899 /storage/innobase/ut | |
| parent | 7da351d8047087fc589f2f6cdd49b0b3647043f5 (diff) | |
| download | mariadb-git-d1edb011eead8401bf14c8d1e90a6fb3f2a4d6e9.tar.gz | |
Cleanup: Remove os0thread
Let us use the common pthread_t wrapper for Microsoft Windows.
This fixes up commit dbe941e06fe51fe0ff30dff5f1ae62960ff4fc61
Diffstat (limited to 'storage/innobase/ut')
| -rw-r--r-- | storage/innobase/ut/ut0ut.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/storage/innobase/ut/ut0ut.cc b/storage/innobase/ut/ut0ut.cc index d49fa9fb16c..5542d5410c2 100644 --- a/storage/innobase/ut/ut0ut.cc +++ b/storage/innobase/ut/ut0ut.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1994, 2017, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2017, 2021, MariaDB Corporation. +Copyright (c) 2017, 2022, MariaDB Corporation. 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 @@ -32,7 +32,6 @@ Created 5/11/1994 Heikki Tuuri #ifndef UNIV_INNOCHECKSUM #include <mysql_com.h> -#include "os0thread.h" #include "ut0ut.h" #include "trx0trx.h" #include <string> @@ -92,7 +91,7 @@ ut_print_timestamp( #ifdef UNIV_INNOCHECKSUM ulint{0} #else - ulint(os_thread_get_curr_id()) + ulint(pthread_self()) #endif ); } |