summaryrefslogtreecommitdiff
path: root/storage/perfschema
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-02-14 09:16:41 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-02-14 09:16:41 +0200
commitfeb8004b58c38e4c06a93329e0b4b48e24deccec (patch)
tree0a2cb801efdd0948ef4de7928dd08f8c4f467b3b /storage/perfschema
parent7b891008ceb2f571ce4f5916217acad8abb46464 (diff)
parent52b32c60c26b512ccf9b1233d7f54c4b56499df3 (diff)
downloadmariadb-git-feb8004b58c38e4c06a93329e0b4b48e24deccec.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'storage/perfschema')
-rw-r--r--storage/perfschema/my_thread.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/perfschema/my_thread.h b/storage/perfschema/my_thread.h
index 5ddea9b1303..c1a079ce34d 100644
--- a/storage/perfschema/my_thread.h
+++ b/storage/perfschema/my_thread.h
@@ -14,6 +14,10 @@
#include <pthread_np.h>
#endif
+#if defined(HAVE_INTEGER_PTHREAD_SELF)
+#include <cstdint>
+#endif
+
typedef pthread_key_t thread_local_key_t;
typedef pthread_t my_thread_handle;
typedef pthread_attr_t my_thread_attr_t;