summaryrefslogtreecommitdiff
path: root/include/mysql/psi/mysql_thread.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-06-21 14:22:52 +0200
committerSergei Golubchik <serg@mariadb.org>2016-06-21 14:22:52 +0200
commit51ed64a520dfbec24b73bffc40494d738713df22 (patch)
treed200a2599395161ddb6bd458ae204ffc5eac3446 /include/mysql/psi/mysql_thread.h
parent72d23896d6590de7af3566e1f74f8dd1134f11f3 (diff)
downloadmariadb-git-51ed64a520dfbec24b73bffc40494d738713df22.tar.gz
5.6.31
Diffstat (limited to 'include/mysql/psi/mysql_thread.h')
-rw-r--r--include/mysql/psi/mysql_thread.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/include/mysql/psi/mysql_thread.h b/include/mysql/psi/mysql_thread.h
index 99fcd348e87..ee2693d2863 100644
--- a/include/mysql/psi/mysql_thread.h
+++ b/include/mysql/psi/mysql_thread.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2016, 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
@@ -587,9 +587,9 @@ static inline void inline_mysql_mutex_register(
PSI_mutex_info *info,
int count
#else
- const char *category __attribute__ ((unused)),
- void *info __attribute__ ((unused)),
- int count __attribute__ ((unused))
+ const char *category MY_ATTRIBUTE ((unused)),
+ void *info MY_ATTRIBUTE ((unused)),
+ int count MY_ATTRIBUTE ((unused))
#endif
)
{
@@ -771,9 +771,9 @@ static inline void inline_mysql_rwlock_register(
PSI_rwlock_info *info,
int count
#else
- const char *category __attribute__ ((unused)),
- void *info __attribute__ ((unused)),
- int count __attribute__ ((unused))
+ const char *category MY_ATTRIBUTE ((unused)),
+ void *info MY_ATTRIBUTE ((unused)),
+ int count MY_ATTRIBUTE ((unused))
#endif
)
{
@@ -1089,9 +1089,9 @@ static inline void inline_mysql_cond_register(
PSI_cond_info *info,
int count
#else
- const char *category __attribute__ ((unused)),
- void *info __attribute__ ((unused)),
- int count __attribute__ ((unused))
+ const char *category MY_ATTRIBUTE ((unused)),
+ void *info MY_ATTRIBUTE ((unused)),
+ int count MY_ATTRIBUTE ((unused))
#endif
)
{
@@ -1231,9 +1231,9 @@ static inline void inline_mysql_thread_register(
PSI_thread_info *info,
int count
#else
- const char *category __attribute__ ((unused)),
- void *info __attribute__ ((unused)),
- int count __attribute__ ((unused))
+ const char *category MY_ATTRIBUTE ((unused)),
+ void *info MY_ATTRIBUTE ((unused)),
+ int count MY_ATTRIBUTE ((unused))
#endif
)
{