1 files changed, 20 insertions, 20 deletions

diff --git a/include/mysql/psi/mysql_socket.h b/include/mysql/psi/mysql_socket.h
index 918acb65ebe..f2f1d5ce519 100644
--- a/include/mysql/psi/mysql_socket.h
+++ b/include/mysql/psi/mysql_socket.h
@@ -109,7 +109,7 @@ mysql_socket_invalid()
   @param socket nstrumented socket
   @param fd socket descriptor
   @param addr unformatted socket address
-  @param adr_len length of socket addres
+  @param adr_len length of socket address
 */
 
 static inline void
@@ -251,7 +251,7 @@ inline_mysql_start_socket_wait(PSI_socket_locker_state *state,
                                const char *src_file, uint src_line)
 {
   struct PSI_socket_locker *locker;
-  if (mysql_socket.m_psi != NULL)
+  if (psi_likely(mysql_socket.m_psi != NULL))
   {
     locker= PSI_SOCKET_CALL(start_socket_wait)
       (state, mysql_socket.m_psi, op, byte_count, src_file, src_line);
@@ -268,7 +268,7 @@ inline_mysql_start_socket_wait(PSI_socket_locker_state *state,
 static inline void
 inline_mysql_end_socket_wait(struct PSI_socket_locker *locker, size_t byte_count)
 {
-  if (locker != NULL)
+  if (psi_likely(locker != NULL))
     PSI_SOCKET_CALL(end_socket_wait)(locker, byte_count);
 }
 
@@ -584,12 +584,12 @@ inline_mysql_socket_bind
 #ifdef HAVE_PSI_SOCKET_INTERFACE
   const char *src_file, uint src_line,
 #endif
-  MYSQL_SOCKET mysql_socket, const struct sockaddr *addr, socklen_t len)
+  MYSQL_SOCKET mysql_socket, const struct sockaddr *addr, size_t len)
 {
   int result;
 
 #ifdef HAVE_PSI_SOCKET_INTERFACE
-  if (mysql_socket.m_psi != NULL)
+  if (psi_likely(mysql_socket.m_psi != NULL))
   {
     /* Instrumentation start */
     PSI_socket_locker_state state;
@@ -598,11 +598,11 @@ inline_mysql_socket_bind
       (&state, mysql_socket.m_psi, PSI_SOCKET_BIND, (size_t)0, src_file, src_line);
 
     /* Instrumented code */
-    result= bind(mysql_socket.fd, addr, len);
+    result= bind(mysql_socket.fd, addr, (int)len);
 
     /* Instrumentation end */
     if (result == 0)
-      PSI_SOCKET_CALL(set_socket_info)(mysql_socket.m_psi, NULL, addr, len);
+      PSI_SOCKET_CALL(set_socket_info)(mysql_socket.m_psi, NULL, addr, (socklen_t)len);
 
     if (locker != NULL)
       PSI_SOCKET_CALL(end_socket_wait)(locker, (size_t)0);
@@ -612,7 +612,7 @@ inline_mysql_socket_bind
 #endif
 
   /* Non instrumented code */
-  result= bind(mysql_socket.fd, addr, len);
+  result= bind(mysql_socket.fd, addr, (int)len);
   return result;
 }
 
@@ -629,7 +629,7 @@ inline_mysql_socket_getsockname
   int result;
 
 #ifdef HAVE_PSI_SOCKET_INTERFACE
-  if (mysql_socket.m_psi != NULL)
+  if (psi_likely(mysql_socket.m_psi != NULL))
   {
     /* Instrumentation start */
     PSI_socket_locker *locker;
@@ -667,7 +667,7 @@ inline_mysql_socket_connect
   int result;
 
 #ifdef HAVE_PSI_SOCKET_INTERFACE
-  if (mysql_socket.m_psi != NULL)
+  if (psi_likely(mysql_socket.m_psi != NULL))
   {
     /* Instrumentation start */
     PSI_socket_locker *locker;
@@ -705,7 +705,7 @@ inline_mysql_socket_getpeername
   int result;
 
 #ifdef HAVE_PSI_SOCKET_INTERFACE
-  if (mysql_socket.m_psi != NULL)
+  if (psi_likely(mysql_socket.m_psi != NULL))
   {
     /* Instrumentation start */
     PSI_socket_locker *locker;
@@ -743,7 +743,7 @@ inline_mysql_socket_send
   ssize_t result;
   DBUG_ASSERT(mysql_socket.fd != INVALID_SOCKET);
 #ifdef HAVE_PSI_SOCKET_INTERFACE
-  if (mysql_socket.m_psi != NULL)
+  if (psi_likely(mysql_socket.m_psi != NULL))
   {
     /* Instrumentation start */
     PSI_socket_locker *locker;
@@ -784,7 +784,7 @@ inline_mysql_socket_recv
   ssize_t result;
   DBUG_ASSERT(mysql_socket.fd != INVALID_SOCKET);
 #ifdef HAVE_PSI_SOCKET_INTERFACE
-  if (mysql_socket.m_psi != NULL)
+  if (psi_likely(mysql_socket.m_psi != NULL))
   {
     /* Instrumentation start */
     PSI_socket_locker *locker;
@@ -825,7 +825,7 @@ inline_mysql_socket_sendto
   ssize_t result;
 
 #ifdef HAVE_PSI_SOCKET_INTERFACE
-  if (mysql_socket.m_psi != NULL)
+  if (psi_likely(mysql_socket.m_psi != NULL))
   {
     /* Instrumentation start */
     PSI_socket_locker *locker;
@@ -867,7 +867,7 @@ inline_mysql_socket_recvfrom
   ssize_t result;
 
 #ifdef HAVE_PSI_SOCKET_INTERFACE
-  if (mysql_socket.m_psi != NULL)
+  if (psi_likely(mysql_socket.m_psi != NULL))
   {
     /* Instrumentation start */
     PSI_socket_locker *locker;
@@ -908,7 +908,7 @@ inline_mysql_socket_getsockopt
   int result;
 
 #ifdef HAVE_PSI_SOCKET_INTERFACE
-  if (mysql_socket.m_psi != NULL)
+  if (psi_likely(mysql_socket.m_psi != NULL))
   {
     /* Instrumentation start */
     PSI_socket_locker *locker;
@@ -947,7 +947,7 @@ inline_mysql_socket_setsockopt
   int result;
 
 #ifdef HAVE_PSI_SOCKET_INTERFACE
-  if (mysql_socket.m_psi)
+  if (psi_likely(mysql_socket.m_psi))
   {
     /* Instrumentation start */
     PSI_socket_locker *locker;
@@ -985,7 +985,7 @@ inline_mysql_socket_listen
   int result;
 
 #ifdef HAVE_PSI_SOCKET_INTERFACE
-  if (mysql_socket.m_psi != NULL)
+  if (psi_likely(mysql_socket.m_psi != NULL))
   {
     /* Instrumentation start */
     PSI_socket_locker *locker;
@@ -1107,7 +1107,7 @@ inline_mysql_socket_close
   int result;
 
 #ifdef HAVE_PSI_SOCKET_INTERFACE
-  if (mysql_socket.m_psi != NULL)
+  if (psi_likely(mysql_socket.m_psi != NULL))
   {
     /* Instrumentation start */
     PSI_socket_locker *locker;
@@ -1162,7 +1162,7 @@ inline_mysql_socket_shutdown
 
 /* Instrumentation start */
 #ifdef HAVE_PSI_SOCKET_INTERFACE
-  if (mysql_socket.m_psi != NULL)
+  if (psi_likely(mysql_socket.m_psi != NULL))
   {
     PSI_socket_locker *locker;
     PSI_socket_locker_state state;