Merge lp:~sergei.glushchenko/percona-server/5.6-ps-bug1203567 into lp:percona-server/5.6

[Sergei Glushchenko]

Merge from 5.5,this diff is smaller, because code has less issues.

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param-valgrind/2/

[Sergei Glushchenko (sergei.glushchenko)]

Updated the branch because 5.5 has been updated. Update introduces nothing new.

[George Ormond Lorch III (gl-az)]

review: Approve (g2)

[Stewart Smith (stewart)]

review: Approve

=== modified file 'Percona-Server/sql/mysqld.cc'
--- Percona-Server/sql/mysqld.cc	2013-08-14 03:57:21 +0000
+++ Percona-Server/sql/mysqld.cc	2013-08-20 18:00:38 +0000
@@ -1496,13 +1496,24 @@
   DBUG_VOID_RETURN;
 }
 
+#ifdef HAVE_CLOSE_SERVER_SOCK
+static void close_socket(MYSQL_SOCKET sock, const char *info)
+{
+  DBUG_ENTER("close_socket");
+
+  if (mysql_socket_getfd(sock) != INVALID_SOCKET)
+  {
+    DBUG_PRINT("info", ("calling shutdown on %s socket", info));
+    (void) mysql_socket_shutdown(sock, SHUT_RDWR);
+  }
+  DBUG_VOID_RETURN;
+}
+#endif
 
 static void close_server_sock()
 {
 #ifdef HAVE_CLOSE_SERVER_SOCK
   DBUG_ENTER("close_server_sock");
-  MYSQL_SOCKET tmp_sock;
-  tmp_sock=ip_sock;
 
   close_socket(base_ip_sock, "TCP/IP");
   close_socket(extra_ip_sock, "TCP/IP");