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

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2015-12-21 21:24:22 +01:00
parent 1788bfe93a 4fdf25afa8
commit a2bcee626d
3462 changed files with 634342 additions and 220599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,7 +149,7 @@ MYSQL_SOCKET socket __attribute__ ((unused))
/**
MYSQL_SOCKET helper. Get socket descriptor.
@param mysql_socket Instrumented socket
@sa mysql_socket_setfd
@sa mysql_socket_getfd
*/
static inline my_socket
mysql_socket_getfd(MYSQL_SOCKET mysql_socket)
@@ -161,7 +161,7 @@ mysql_socket_getfd(MYSQL_SOCKET mysql_socket)
MYSQL_SOCKET helper. Set socket descriptor.
@param mysql_socket Instrumented socket
@param fd Socket descriptor
@sa mysql_socket_getfd
@sa mysql_socket_setfd
*/
static inline void
mysql_socket_setfd(MYSQL_SOCKET *mysql_socket, my_socket fd)