database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

5.6.31

Browse Source
This commit is contained in:
Sergei Golubchik
2016-06-21 14:22:52 +02:00
parent 72d23896d6
commit 51ed64a520
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/mysql/psi/mysql_file.h
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2012, 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 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 it under the terms of the GNU General Public License as published by
@@ -511,9 +511,9 @@ static inline void inline_mysql_file_register(
PSI_file_info *info, PSI_file_info *info,
int count int count
#else #else
const char *category __attribute__ ((unused)), const char *category MY_ATTRIBUTE ((unused)),
void *info __attribute__ ((unused)), void *info MY_ATTRIBUTE ((unused)),
int count __attribute__ ((unused)) int count MY_ATTRIBUTE ((unused))
#endif #endif
) )
{ {

10
include/mysql/psi/mysql_socket.h
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. /* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as modify it under the terms of the GNU General Public License as
@@ -114,9 +114,9 @@ mysql_socket_set_address(
const struct sockaddr *addr, const struct sockaddr *addr,
socklen_t addr_len socklen_t addr_len
#else #else
MYSQL_SOCKET socket __attribute__ ((unused)), MYSQL_SOCKET socket MY_ATTRIBUTE ((unused)),
const struct sockaddr *addr __attribute__ ((unused)), const struct sockaddr *addr MY_ATTRIBUTE ((unused)),
socklen_t addr_len __attribute__ ((unused)) socklen_t addr_len MY_ATTRIBUTE ((unused))
#endif #endif
) )
{ {
@@ -136,7 +136,7 @@ mysql_socket_set_thread_owner(
#ifdef HAVE_PSI_SOCKET_INTERFACE #ifdef HAVE_PSI_SOCKET_INTERFACE
MYSQL_SOCKET socket MYSQL_SOCKET socket
#else #else
MYSQL_SOCKET socket __attribute__ ((unused)) MYSQL_SOCKET socket MY_ATTRIBUTE ((unused))
#endif #endif
) )
{ {

26
include/mysql/psi/mysql_thread.h
View File

@@ -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 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 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, PSI_mutex_info *info,
int count int count
#else #else
const char *category __attribute__ ((unused)), const char *category MY_ATTRIBUTE ((unused)),
void *info __attribute__ ((unused)), void *info MY_ATTRIBUTE ((unused)),
int count __attribute__ ((unused)) int count MY_ATTRIBUTE ((unused))
#endif #endif
) )
{ {
@@ -771,9 +771,9 @@ static inline void inline_mysql_rwlock_register(
PSI_rwlock_info *info, PSI_rwlock_info *info,
int count int count
#else #else
const char *category __attribute__ ((unused)), const char *category MY_ATTRIBUTE ((unused)),
void *info __attribute__ ((unused)), void *info MY_ATTRIBUTE ((unused)),
int count __attribute__ ((unused)) int count MY_ATTRIBUTE ((unused))
#endif #endif
) )
{ {
@@ -1089,9 +1089,9 @@ static inline void inline_mysql_cond_register(
PSI_cond_info *info, PSI_cond_info *info,
int count int count
#else #else
const char *category __attribute__ ((unused)), const char *category MY_ATTRIBUTE ((unused)),
void *info __attribute__ ((unused)), void *info MY_ATTRIBUTE ((unused)),
int count __attribute__ ((unused)) int count MY_ATTRIBUTE ((unused))
#endif #endif
) )
{ {
@@ -1231,9 +1231,9 @@ static inline void inline_mysql_thread_register(
PSI_thread_info *info, PSI_thread_info *info,
int count int count
#else #else
const char *category __attribute__ ((unused)), const char *category MY_ATTRIBUTE ((unused)),
void *info __attribute__ ((unused)), void *info MY_ATTRIBUTE ((unused)),
int count __attribute__ ((unused)) int count MY_ATTRIBUTE ((unused))
#endif #endif
) )
{ {